diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 03:22:04 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 03:22:04 +0100 |
| commit | e07e0d4cb0c4bfe822ec8491cc06269096a38bea (patch) | |
| tree | 856bbf6c33d4de660d0b1e2c85019d0d3555123f /arch/x86/boot/video-mode.c | |
| parent | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Merge tag 'please-pull-einj-mmcfg' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | linux-e07e0d4cb0c4bfe822ec8491cc06269096a38bea.tar.xz linux-e07e0d4cb0c4bfe822ec8491cc06269096a38bea.zip | |
Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 RAS update from Ingo Molnar:
"The changes in this cycle were:
- allow mmcfg access to APEI error injection handlers
- improve MCE error messages
- smaller cleanups"
* 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, mce: Fix sparse errors
x86, mce: Improve timeout error messages
ACPI, EINJ: Enhance error injection tolerance level
Diffstat (limited to 'arch/x86/boot/video-mode.c')
0 files changed, 0 insertions, 0 deletions