]> 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, 27 Sep 2011 05:47:17 +0000 (15:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 05:47:17 +0000 (15:47 +1000)
commit9c78627ce28b94fe197f5369c6904e3aa35bba23
treed8780f4c25fea9217283a5da9c4e7b09a0cb42eb
parentec4ac0eb8288280fd4881f3779d8dce883aa7eee
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