]> 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, 13 Sep 2011 05:23:05 +0000 (15:23 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 05:23:05 +0000 (15:23 +1000)
commitad5f2d805860671f9443ce69fd20f0d63756a42b
tree4da61a861e6930ab1687ad0c8289f53b6337c8c5
parent90cbe606a6d139881be1ec3d20dfb34b2de070cc
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