]> 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, 30 Aug 2011 05:20:50 +0000 (15:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Aug 2011 05:20:50 +0000 (15:20 +1000)
commitbc8cb8061bfd1af7ec0cf419496b5563981692b4
treeef3d86c4c591e85d2280aebf9305c59217112f4d
parentd987c6d885c8109e9de607c1bec879236cecae4f
parent0e392412f334c80baedb30a29796a256b0d5e629
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
net/core/dev.c