summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-01 18:27:43 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-01 18:27:43 -0800
commit1f033c1a6ec1a6815e9c4507d83eb20161163c37 (patch)
treeef2f12d633a231d341c9bbd1b75b0cf22c21d67d /fs
parent13fb2d10371581f42c81da54ef7a1e1a9dfe6d46 (diff)
parent741b9c7da1abf2f96f69d232fbeef5aff1371be3 (diff)
downloadlinux-1f033c1a6ec1a6815e9c4507d83eb20161163c37.tar.gz
linux-1f033c1a6ec1a6815e9c4507d83eb20161163c37.tar.bz2
linux-1f033c1a6ec1a6815e9c4507d83eb20161163c37.zip
Merge git://www.linux-watchdog.org/linux-watchdog
Watchdog updates from Wim Van Sebroeck: * git://www.linux-watchdog.org/linux-watchdog: watchdog: fix GETTIMEOUT ioctl in booke_wdt watchdog: update maintainers git entry watchdog: Fix typo in pnx4008_wdt.c watchdog: Fix typo in Kconfig watchdog: fix error in probe() of s3c2410_wdt (reset at booting) watchdog: hpwdt: clean up set_memory_x call for 32 bit
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions