]> 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, 12 Oct 2011 05:08:06 +0000 (16:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 05:08:06 +0000 (16:08 +1100)
commitbfdee78e6c57d6e7fe4ebd2cb9982709e3bf83d5
treea07535521020b9f4459ad1e8cc5d83a3fa5b1c09
parentbe758b1b131403ac94979288b6985487ab57abc3
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