diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 08:42:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 08:42:45 -0700 |
| commit | 5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e (patch) | |
| tree | df094aa1544281ec0894eee48ad60c9d000a18ba /drivers/misc/mei/pci-me.c | |
| parent | 74c7d2f5200a340ae6655e9adcf990381e387937 (diff) | |
| parent | 5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e (diff) | |
| download | linux-5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e.tar.bz2 | |
Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 RAS changes from Ingo Molnar:
- Add an Intel CMCI hotplug fix
- Add AMD family 16h EDAC support
- Make the AMD MCE banks code more flexible for virtual environments
* 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
amd64_edac: Add Family 16h support
x86/mce: Rework cmci_rediscover() to play well with CPU hotplug
x86, MCE, AMD: Use MCG_CAP MSR to find out number of banks on AMD
x86, MCE, AMD: Replace shared_bank array with is_shared_bank() helper
Diffstat (limited to 'drivers/misc/mei/pci-me.c')
0 files changed, 0 insertions, 0 deletions