]> 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>
Mon, 12 Sep 2011 04:52:10 +0000 (14:52 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 04:52:10 +0000 (14:52 +1000)
commit743d8e27dd5f962e6499cfede5a40b6f6fe34ebc
tree9dcb1dbc57feceb005ce066cb7bb50dd0308cf9b
parent62cdc8c2435b8d986b87c309384b9060acf41826
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
net/core/dev.c