summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-24 20:23:35 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-24 20:23:35 +0200
commitde08341a0ef747d607542af3ae441b286f503e35 (patch)
tree97bdcb8323239800275ecc49bc2848e1e3d9037c /arch/x86/kernel
parentMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentRevert "[WATCHDOG] hpwdt: Add CFLAGS to get driver working" (diff)
downloadlinux-de08341a0ef747d607542af3ae441b286f503e35.tar.xz
linux-de08341a0ef747d607542af3ae441b286f503e35.zip
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: Revert "[WATCHDOG] hpwdt: Add CFLAGS to get driver working"
Diffstat (limited to 'arch/x86/kernel')
0 files changed, 0 insertions, 0 deletions