Merge branches 'fixes', 'misc', 'mmci', 'unstable/dma-for-next' and 'sa11x0' into...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/common/mcpm_entry.c
Simple merge

diff --cc arch/arm/include/asm/Kbuild
Simple merge

diff --cc arch/arm/include/asm/mcpm.h
Simple merge

diff --cc arch/arm/include/asm/spinlock.h
Simple merge

diff --cc arch/arm/kernel/head.S
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/powerpc/kernel/vio.c
Simple merge

diff --cc drivers/dma/edma.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/staging/imx-drm/imx-drm-core.c
Simple merge

diff --cc drivers/usb/chipidea/ci_hdrc_imx.c
Simple merge

diff --cc drivers/usb/host/ehci-octeon.c
Simple merge