diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-23 12:07:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-23 12:07:29 -0700 |
| commit | 1ad9bf9fdc29d36baa2db1d0f09ec684ff915f2b (patch) | |
| tree | fd9822439cce9931900b4f98f76e171f3797cbe5 /Documentation/acpi/DSD-properties-rules.txt | |
| parent | 82b23cb94b8cee25781c209d9b1df3b144c8bb5f (diff) | |
| parent | ea5dfb5fae81939f777ca569d8cfb599252da2e8 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc fixes: two EDAC driver fixes, a Xen crash fix, a HyperV log spam
fix and a documentation fix"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86 EDAC, sb_edac.c: Take account of channel hashing when needed
x86 EDAC, sb_edac.c: Repair damage introduced when "fixing" channel address
x86/mm/xen: Suppress hugetlbfs in PV guests
x86/doc: Correct limits in Documentation/x86/x86_64/mm.txt
x86/hyperv: Avoid reporting bogus NMI status for Gen2 instances
Diffstat (limited to 'Documentation/acpi/DSD-properties-rules.txt')