Conflicts:
	drivers/power/wm97xx_battery.c

Conflicts:
	drivers/net/virtio_net.c

Conflicts:
	drivers/mtd/mtdcore.c

Conflicts:
	drivers/acpi/power.c

Conflicts:
	scripts/extract-ikconfig

Conflicts:
	drivers/media/video/sh_mobile_ceu_camera.c

Conflicts:
	arch/powerpc/kernel/pci_64.c

Conflicts:
	fs/xfs/linux-2.6/xfs_lrw.c

Conflicts:
	fs/ubifs/super.c

Conflicts:
	arch/microblaze/include/asm/device.h
	drivers/base/platform.c

Conflicts:
	kernel/gcov/Kconfig