| commit | e25bda564299e431200d1e0e1a229679f45437aa | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 27 07:55:51 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 27 07:55:51 2012 -0800 |
| tree | 06b7fc80ea2e3bdd38bcb7d9f46ea723ba89ee78 | |
| parent | 70ca00db106297af0dbb88df9cc837d98cdc0c15 [diff] | |
| parent | 3f806e50981825fa56a7f1938f24c0680816be45 [diff] |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/mce/AMD: Fix UP build error x86: Specify a size for the cmp in the NMI handler x86/nmi: Test saved %cs in NMI to determine nested NMI case x86/amd: Fix L1i and L2 cache sharing information for AMD family 15h processors x86/microcode: Remove noisy AMD microcode warning