summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/nuc900_wdt.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-07-21 21:45:02 +0200
committerIngo Molnar <mingo@elte.hu>2010-07-21 21:45:08 +0200
commitdca45ad8af54963c005393a484ad117b8ba6150f (patch)
tree7c9a6966283a6bb12b54e5680a67d203be292930 /drivers/watchdog/nuc900_wdt.c
parentsched: No need for bootmem special cases (diff)
parentMerge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/... (diff)
downloadlinux-dca45ad8af54963c005393a484ad117b8ba6150f.tar.xz
linux-dca45ad8af54963c005393a484ad117b8ba6150f.zip
Merge branch 'linus' into sched/core
Merge reason: Move from the -rc3 to the almost-rc6 base. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/watchdog/nuc900_wdt.c')
0 files changed, 0 insertions, 0 deletions