]> 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>
Thu, 6 Oct 2011 04:33:11 +0000 (15:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 04:33:11 +0000 (15:33 +1100)
commit49933676fe88295cc1c800b3cc21458c5e3a0fa6
treeddc2d63b1fa2b74bf42986a062bdef0c8b5ca895
parent291917f6f316cb710820f126660dc09caba513e8
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