diff options
Merge branches 'x86/cleanups', 'x86/cpu', 'x86/debug', 'x86/mce2', 'x86/mm', 'x86/mtrr', 'x86/setup', 'x86/setup-memory', 'x86/urgent', 'x86/uv', 'x86/x2apic' and 'linus' into x86/core
Conflicts:
arch/parisc/kernel/irq.c
![]() |
index : platform/kernel/linux-3.10 | |
Domain: System / Kernel; | Inki Dae <inki.dae@samsung.com> |
summaryrefslogtreecommitdiff |