summaryrefslogtreecommitdiffstats
path: root/fs/afs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-28 07:55:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-28 07:55:35 -0700
commit696e65c3606aa3f587eeb181766baf49ea750cfc (patch)
tree1975089f9faa51eb40f6680b3dd7394cd57b8eed /fs/afs
parent1600f9def09de07c5dbeb539e978fa73880690dd (diff)
parentd8d8b63b6dc413696ade040e52173c068df11702 (diff)
downloadlinux-696e65c3606aa3f587eeb181766baf49ea750cfc.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: watchdog: booke_wdt: fix build - unconstify watchdog_info watchdog: sbc_fitpc2_wdt: fixed "scheduling while atomic" bug. watchdog: sbc_fitpc2_wdt: fixed I/O operations order Watchdog: sb_wdog.c: Fix sibyte watchdog initialization
Diffstat (limited to 'fs/afs')
0 files changed, 0 insertions, 0 deletions