Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Apr 2008 16:03:19 +0000 (09:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Apr 2008 16:03:19 +0000 (09:03 -0700)
commit1f43c5393033de90bac4410352b1d2a69dcbe7ef
tree3e6c3b9e9ea4dd6620a3b8332546a3cbbeddb1fd
parentc135b6592bd63925397e60425e0301f33f06c7a6
parente90955c26d8af318658c45caadb1d330ac6a506c
Merge branch 'for-linus' of git://git./linux/kernel/git/x86/linux-2.6-x86-fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
  x86: fix PCI MSI breaks when booting with nosmp
  x86: vget_cycles() __always_inline
  x86: add more boot protocol documentation
  bootprotocol: cleanup
  x86: fix warning in "x86: clean up vSMP detection"
  x86: !x & y typo in mtrr code