Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Conflicts:
	drivers/scsi/Makefile

Conflicts:
	drivers/base/class.c
	drivers/mtd/mtdcore.c
	init/main.c

Conflicts:
	arch/x86/kernel/setup.c

Conflicts:
	arch/x86/kernel/setup.c

Conflicts:
	drivers/pci/intel-iommu.c

Conflicts:
	drivers/regulator/Kconfig

Conflicts:
	firmware/Makefile

Conflicts:
	drivers/power/wm97xx_battery.c

Conflicts:
	drivers/net/virtio_net.c

Conflicts:
	drivers/mtd/mtdcore.c