]> 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>
Tue, 4 Oct 2011 05:30:04 +0000 (16:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 05:30:04 +0000 (16:30 +1100)
commitad3b0015b96d1ff7884bd492ea1e7feae85fea9f
tree38ca8a4a04a0dc35b48e062a09f55149efa10622
parent2ad1560ac90fc3c25ac8f878ecc6d99f15bc06b2
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