aboutsummaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-17 08:36:10 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-17 08:36:10 -0800
commit2ffbb8377c7a0713baf6644e285adc27a5654582 (patch)
tree055f1fad06e1dba8c2e782786a7cfc2ea448a7f3 /drivers/watchdog
parent6840999b192b1b57d713ddee3761c457a2779036 (diff)
parent80ef88d6d23bf1b94d65db0ac32334d01b9f7350 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: simplify "make ARCH=x86" and fix kconfig all.config x86: reboot fixup for wrap2c board x86: check boundary in count setup resource x86: fix reboot with no keyboard attached x86: add hpet sanity checks x86: on x86_64, correct reading of PC RTC when update in progress in time_64.c x86: fix freeze in x86_64 RTC update code in time_64.c ntp: fix typo that makes sync_cmos_clock erratic Remove x86 merge artifact from top Makefile x86: fixup cpu_info array conversion x86: show cpuinfo only for online CPUs x86: fix cpu-hotplug regression x86: ignore the sys_getcpu() tcache parameter x86: voyager use correct header file name x86: fix smp init sections x86: fix voyager_cat_init section x86: fix bogus memcpy in es7000_check_dsdt()
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions