summaryrefslogtreecommitdiff
path: root/pcap_rw.c
diff options
context:
space:
mode:
Diffstat (limited to 'pcap_rw.c')
0 files changed, 0 insertions, 0 deletions
45963c8731f450f (diff)parent517550075c31917dc729d7cec0b4a0ca65294f14 (diff)
Merge tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt
Merge "Second batch of DT changes for 4.7" from Nicolas Ferre: - three low priority fixes: - sama5d2: one pin definition and dependency with the slow clock for watchdog - sama5d4: definition of watchdog IRQ property - addition of the new shutdown controller to sama5d2 & sama5d2 Xplained * tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: dts: at91: sama5d2: add slow clock to watchdog node ARM: dts: at91: sama5d2: add shutdown controller node ARM: dts: at91: sama5d4: add watchdog interrupt property ARM: dts: at91: fix typo in sama5d2 PIN_PD24 description
Diffstat