From: Linus Torvalds Date: Thu, 27 Mar 2008 20:20:47 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux... X-Git-Tag: v2.6.25-rc8~73 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fb8c7fb25d7d754a992481e9f763ec0b5889c4d9;p=linux-2.6-omap-h63xx.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: xen: fix UP setup of shared_info xen: fix RMW when unmasking events x86, documentation: nmi_watchdog=2 works on x86_64 x86: stricter check in follow_huge_addr() rdc321x: GPIO routines bugfixes x86: ptrace.c: fix defined-but-unused warnings x86: fix prefetch workaround --- fb8c7fb25d7d754a992481e9f763ec0b5889c4d9