tree 3e6c3b9e9ea4dd6620a3b8332546a3cbbeddb1fd
parent c135b6592bd63925397e60425e0301f33f06c7a6
parent e90955c26d8af318658c45caadb1d330ac6a506c
author Linus Torvalds <torvalds@linux-foundation.org> 1209484999 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1209484999 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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