]> 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>
Mon, 5 Sep 2011 06:30:23 +0000 (16:30 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 06:30:23 +0000 (16:30 +1000)
commitf2c01963a752f103b5ba36d35293a5958def5198
treee8ce96a68626c77511a110334b5eba62b14a2418
parentbf3b70453ba5f70e08a46014392c78e1247a76b1
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