diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 15:47:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 15:47:40 -0700 |
| commit | 06b77b97338e906e8af73a9b5f97b9162aac239d (patch) | |
| tree | fc4fc5c5153dc5a1979e7d46b08dea20054a1d9e /arch/arm/mm/dma-mapping.c | |
| parent | 4aef77b2fe373cdba461925589b9d1d4468ee016 (diff) | |
| parent | 716079f66eacd31d040db9cd0627ca0d625d6126 (diff) | |
Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
Pull x86 RAS changes from Ingo Molnar:
"Improve mcheck device initialization and bootstrap robustness"
* 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
mce: Panic when a core has reached a timeout
x86/mce: Improve mcheck_init_device() error handling
Diffstat (limited to 'arch/arm/mm/dma-mapping.c')
0 files changed, 0 insertions, 0 deletions