]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'driver-core/driver-core-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:59:08 +0000 (14:59 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:59:08 +0000 (14:59 +0200)
commitb4cd00c6ba59009062938d8b432aebb18fd07d8a
tree23e74d9daee46e20615095bd27272fee8a4f8d38
parent0ea0087dcb10647ad3acf4f523e597bacd6215ba
parent0cba7de7f6cdcf84c9b75d29041c475aedeb45c9
Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
include/linux/netdevice.h
arch/powerpc/kernel/vio.c
drivers/md/md.c
drivers/mmc/core/bus.c
drivers/mmc/host/mvsdio.c
drivers/mtd/nand/atmel_nand.c
drivers/net/bonding/bond_sysfs.c
include/linux/netdevice.h
kernel/events/core.c