tree c674cbed424876b95ddb23ec99344574be0dab39
parent ff2a9941ca27ab18169d17b3803aca68b154951c
parent 6ec5ff4bc3a90b7716eadc4c8a686e904131f03a
author Linus Torvalds <torvalds@linux-foundation.org> 1306165915 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306165915 -0700

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