summaryrefslogtreecommitdiffstats
path: root/kernel/watchdog.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-01-14 06:50:27 +0100
committerDavid S. Miller <davem@davemloft.net>2014-01-14 06:50:27 +0100
commit853dc21bfe15f545347b5c82aad02735d552110d (patch)
treee5881a889f67211727d0422d617d01a2c1495da6 /kernel/watchdog.c
parentnet: resort some Kbuild files to hopefully help avoid some conflicts (diff)
parentbatman-adv: drop dependency against CRC16 (diff)
downloadlinux-853dc21bfe15f545347b5c82aad02735d552110d.tar.xz
linux-853dc21bfe15f545347b5c82aad02735d552110d.zip
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes: - drop dependency against CRC16 - move to new release version - add size check at compile time for packet structs - update copyright years in every file - implement new bonding/interface alternation feature Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/watchdog.c')
0 files changed, 0 insertions, 0 deletions