]> 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, 1 Sep 2011 02:41:23 +0000 (12:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Sep 2011 02:41:23 +0000 (12:41 +1000)
commitef2a87e5ab9feee23cd399ea4619887496b9364f
tree0d579c0dc70514e345cba84290c692a9f79e08f8
parent6870af050199651e2e68eaf0d29c248890a32a23
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