]> git.karo-electronics.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>
Thu, 24 Oct 2013 10:17:49 +0000 (11:17 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 24 Oct 2013 10:17:49 +0000 (11:17 +0100)
commit8ead89f7e42fa9723d48dab389e59d78992e1cc3
treeecd6b33343640576cba5a8e0b3a056b3f385da94
parent18805c3fdd2fa89a54938e33be6446f2b5971f1f
parent0ea1ec713f04bdfac343c9702b21cd3a7c711826
parent79a71f26a10430ae6eb74d8a056f7782216b27e6
parent1ff44433c661c30afde6e6d2c47a29039a293da4
parent223016339ce72f67930a6d9c6d41839bc3046e46
parentc08b1874a3b6c01cc783f872c7342fe82476cae3
Merge branches 'fixes', 'misc', 'mmci', 'unstable/dma-for-next' and 'sa11x0' into for-next
17 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/arm/mm/dma-mapping.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