Conflicts:
	arch/x86/kernel/setup.c

Conflicts:
	arch/sh/kernel/vmlinux.lds.S
	kernel/sched.c
	mm/percpu.c

Conflicts:
	arch/x86/kernel/setup.c
	drivers/pci/dmar.c
	drivers/pci/intel-iommu.c

Conflicts:
	drivers/char/agp/uninorth-agp.c

Conflicts:
	drivers/regulator/Kconfig

Conflicts:
	firmware/Makefile

Conflicts:
	drivers/input/misc/Kconfig

Conflicts:
	drivers/power/wm97xx_battery.c

Conflicts:
	drivers/net/virtio_net.c

Conflicts:
	drivers/mtd/mtdcore.c

Conflicts:
	drivers/acpi/power.c