]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'driver-core/driver-core-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 05:26:01 +0000 (15:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 05:26:01 +0000 (15:26 +1000)
commitdca61cb218650063300a5ce7c0ba2d35e4943864
treed2e814195e09b29c7a2f115ecfd7e0d2c7d973a4
parent9793fa5b08f02ca2e466268a7b8eedb3bf0e0d48
parentbb07b00be77fb33274cb44a03bdbf2471e556189
Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
drivers/base/cpu.c
drivers/base/firmware_class.c
drivers/base/memory.c
include/linux/platform_device.h
13 files changed:
arch/arm/Kconfig
arch/cris/arch-v32/drivers/Kconfig
arch/mips/Kconfig
arch/powerpc/Kconfig
drivers/base/core.c
drivers/base/cpu.c
drivers/base/firmware_class.c
drivers/base/memory.c
drivers/base/platform.c
drivers/edac/Kconfig
include/linux/platform_device.h
init/Kconfig
kernel/power/Kconfig