]> 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>
Fri, 28 Jun 2013 05:17:58 +0000 (15:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 05:17:58 +0000 (15:17 +1000)
commit5fe010ca6f526029f65a43cafd232061922f4711
tree85f0da63cc37e41156ea29905a628fd1632150e6
parenta96aa74fae2b0e9e8ac8aefcb5d65eee42d995ee
parentbfd63cd24df69120585c22e09fda78723772ee2a
Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
drivers/base/cpu.c
drivers/base/memory.c
include/linux/device.h
include/linux/platform_device.h
18 files changed:
Documentation/cpu-hotplug.txt
Documentation/kbuild/kconfig.txt
arch/arm/Kconfig
arch/cris/arch-v32/drivers/Kconfig
arch/mips/Kconfig
arch/powerpc/Kconfig
arch/powerpc/mm/tlb_hash64.c
arch/x86/Kconfig
drivers/base/core.c
drivers/base/cpu.c
drivers/base/memory.c
drivers/base/platform.c
drivers/edac/Kconfig
fs/sysfs/dir.c
include/linux/device.h
include/linux/platform_device.h
init/Kconfig
kernel/power/Kconfig