]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branches 'fixes', 'misc', 'mmci', 'unstable/dma-for-next' and 'sa11x0' into...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 23 Oct 2013 22:38:54 +0000 (23:38 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 23 Oct 2013 22:38:54 +0000 (23:38 +0100)
commit8b7312c3cfa25ad3901b6446ea55a743baf2b432
treef1cf6d306605a68e0ad450e24559a4f2bd0d9607
parent613c2e81ca0f003db17b71b78dadb3b25f56c35e
parent59fd3033b55642da97b4ecde0c85de78d7229675
parent79a71f26a10430ae6eb74d8a056f7782216b27e6
parent1ff44433c661c30afde6e6d2c47a29039a293da4
parent223016339ce72f67930a6d9c6d41839bc3046e46
parentc08b1874a3b6c01cc783f872c7342fe82476cae3
Merge branches 'fixes', 'misc', 'mmci', 'unstable/dma-for-next' and 'sa11x0' into for-next
16 files changed:
arch/arm/Kconfig
arch/arm/common/mcpm_entry.c
arch/arm/include/asm/Kbuild
arch/arm/include/asm/mcpm.h
arch/arm/include/asm/spinlock.h
arch/arm/kernel/head.S
arch/arm/kernel/setup.c
arch/powerpc/kernel/vio.c
drivers/dma/edma.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/staging/imx-drm/imx-drm-core.c
drivers/usb/chipidea/ci_hdrc_imx.c
drivers/usb/host/ehci-octeon.c