]> 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>
Wed, 5 Oct 2011 06:56:54 +0000 (17:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 06:56:54 +0000 (17:56 +1100)
commit07565a1536ed2e2b30bbd141db489c5de35e375f
treed9f9cb9bea6dd2ecc858a611797f5390a8ab27d0
parent2a9610b20e33d78359208aedff2f2c13ae8c0ce9
parentc4253cb0748cd50060d04d838c38b07f1ad0e6e5
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