aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/sleep.S
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-19 19:41:59 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-19 19:41:59 -0400
commitb0c51b7d650d5109c8e71e19d5e7ce9b71af7dff (patch)
treedcbb5da853601a2e80829402adbd03435469eb10 /arch/arm/mach-s3c2410/sleep.S
parentee433530d96a7b0af24ab616e5b51f1d89f9ae38 (diff)
parent655516c80ccb3ab2ba2d3063715889b00552a8b3 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] s3c2410_wdt.c stop watchdog after boot [WATCHDOG] i8xx_tco.c - remove support for ICH6 + ICH7 [WATCHDOG] Documentation/watchdog/watchdog-api.txt - fix watchdog daemon [WATCHDOG] sc1200wdt.c printk fix
Diffstat (limited to 'arch/arm/mach-s3c2410/sleep.S')
0 files changed, 0 insertions, 0 deletions