]> 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>
Fri, 30 Sep 2011 03:35:38 +0000 (13:35 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 03:35:38 +0000 (13:35 +1000)
commitd54f751a916a2d2e2f9489fbd537e939064a8202
tree34007f7fdb355ab2a413dbe1010583b7867861b8
parentbbead13f7030892b8e5f16f022fee3067b0c73c3
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
lib/dynamic_debug.c
net/core/dev.c