commit | fb8c7fb25d7d754a992481e9f763ec0b5889c4d9 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 27 13:20:47 2008 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 27 13:20:47 2008 -0700 |
tree | d43cd30836988e263ddeecd54a6c74e9ac03aad2 | |
parent | 074fcab574a36edec35d2e74955250f2e17d6000 [diff] | |
parent | 2e8fe719b57bbdc9e313daed1204bb55fed3ed44 [diff] |
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