]> 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, 25 Oct 2011 08:07:40 +0000 (19:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Oct 2011 08:07:40 +0000 (19:07 +1100)
commit685da2cc59c11b8e0fa0ab621fb4fb21c2278e49
treeacdf99e5b179d4f12c6a64cbac8a9f3406c38163
parent1bb5a4fbed3bc0d7a7cedb9501e069924cb8c854
parent2bbcb8788311a40714b585fc11b51da6ffa2ab92
Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
arch/arm/plat-mxc/devices.c
fs/sysfs/dir.c
MAINTAINERS
arch/arm/plat-mxc/devices.c
arch/arm/plat-mxc/include/mach/devices-common.h
drivers/base/platform.c
fs/sysfs/dir.c
fs/sysfs/inode.c
include/linux/device.h
include/linux/netdevice.h
lib/dynamic_debug.c
net/core/dev.c