]> 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, 14 Oct 2011 05:11:10 +0000 (16:11 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 05:11:10 +0000 (16:11 +1100)
commitc4aafa552a8fd14895c9e4226129ad10aa0cc2fa
tree85faf3680bdccad4bb33d0c75a81020406215e49
parentce127027426dfcd42983ef5833e5050fa39bc6b5
parentc4253cb0748cd50060d04d838c38b07f1ad0e6e5
Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
arch/arm/plat-mxc/devices.c
MAINTAINERS
arch/arm/plat-mxc/devices.c
arch/arm/plat-mxc/include/mach/devices-common.h
drivers/base/platform.c
include/linux/device.h
include/linux/netdevice.h
lib/dynamic_debug.c
net/core/dev.c