Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
commitd7ef64a9f9987b29e3d911369a9d40122d5be2dd
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 May 2011 15:51:55 +0000 (23 08:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 May 2011 15:51:55 +0000 (23 08:51 -0700)
treec674cbed424876b95ddb23ec99344574be0dab39
parentff2a9941ca27ab18169d17b3803aca68b154951c
parent6ec5ff4bc3a90b7716eadc4c8a686e904131f03a
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Eliminate various 'set but not used' warnings
  x86, SMEP: Fix section mismatch warnings
  x86, amd: Use _safe() msr access for GartTlbWlk disable code