]> 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>
Fri, 9 Sep 2011 05:24:46 +0000 (15:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 05:24:46 +0000 (15:24 +1000)
commit6aa839db9d07f49781b6daf1ebc967441ace8415
tree3e1ab8e16fad10726149a135a50e7e4fe89d1d65
parentb747b6ae0c73e8dba8e4dae5af0974494a2b568b
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