]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'driver-core/driver-core-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 15 Sep 2011 05:35:43 +0000 (15:35 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 15 Sep 2011 05:35:43 +0000 (15:35 +1000)
commit5edeffc46a3dff24a0eddc16b87493e3ef5bb25c
tree61eec9b9aed4fc2c9fe22e412fa775a58fb80c3e
parent7f00313682c3f45009d16db3090bc6088f1445e4
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