summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/ixp4xx_wdt.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-08 03:14:24 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-08 03:14:24 +0200
commitaeee90dfa01844168cd7f8051d0a0f969c573067 (patch)
treef7a62a16a1484321ce5b4306d5e5f7fa8819243c /drivers/watchdog/ixp4xx_wdt.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff)
parenttracehook: fix CLONE_PTRACE (diff)
downloadlinux-aeee90dfa01844168cd7f8051d0a0f969c573067.tar.xz
linux-aeee90dfa01844168cd7f8051d0a0f969c573067.zip
Merge branch 'tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace
* 'tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace: tracehook: fix CLONE_PTRACE
Diffstat (limited to 'drivers/watchdog/ixp4xx_wdt.c')
0 files changed, 0 insertions, 0 deletions