| commit | d7ef64a9f9987b29e3d911369a9d40122d5be2dd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 23 08:51:55 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 23 08:51:55 2011 -0700 |
| tree | c674cbed424876b95ddb23ec99344574be0dab39 | |
| parent | ff2a9941ca27ab18169d17b3803aca68b154951c [diff] | |
| parent | 6ec5ff4bc3a90b7716eadc4c8a686e904131f03a [diff] |
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