6e15cf0486
Conflicts:
arch/parisc/kernel/irq.c
arch/x86/include/asm/fixmap_64.h
arch/x86/include/asm/setup.h
kernel/irq/handle.c
Semantic merge:
arch/x86/include/asm/fixmap.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
||
|---|---|---|
| .. | ||
| acpica | ||
| Kconfig | ||
| Makefile | ||
| ac.c | ||
| acpi_memhotplug.c | ||
| battery.c | ||
| blacklist.c | ||
| bus.c | ||
| button.c | ||
| cm_sbs.c | ||
| container.c | ||
| debug.c | ||
| dock.c | ||
| ec.c | ||
| event.c | ||
| fan.c | ||
| glue.c | ||
| numa.c | ||
| osl.c | ||
| pci_bind.c | ||
| pci_irq.c | ||
| pci_link.c | ||
| pci_root.c | ||
| pci_slot.c | ||
| power.c | ||
| proc.c | ||
| processor_core.c | ||
| processor_idle.c | ||
| processor_perflib.c | ||
| processor_thermal.c | ||
| processor_throttling.c | ||
| reboot.c | ||
| sbs.c | ||
| sbshc.c | ||
| sbshc.h | ||
| scan.c | ||
| sleep.c | ||
| sleep.h | ||
| system.c | ||
| tables.c | ||
| thermal.c | ||
| utils.c | ||
| video.c | ||
| video_detect.c | ||
| wakeup.c | ||