Merge branch 'next/cross-platform' into for-next

Conflicts:
	arch/arm/include/asm/hardware/cache-l2x0.h
	arch/arm/mach-nuc93x/Makefile.boot
	arch/arm/mach-u300/Makefile.boot

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/compressed/Makefile
Simple merge

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

diff --cc arch/arm/include/asm/hardware/cache-l2x0.h
index 99a6ed7e1bfd5ce6395ca7a900079ada255da281,8fe149f2fcf3944cd1db3595c4faa3be25855a8b..c48cb1e1c46cd02a536e83a9a1acb49b439fa531
--- 1/arch/arm/include/asm/hardware/cache-l2x0.h
--- 2/arch/arm/include/asm/hardware/cache-l2x0.h
+++ b/arch/arm/include/asm/hardware/cache-l2x0.h
@@@ -45,13 -45,10 +45,15 @@@
  #define L2X0_CLEAN_INV_LINE_PA                0x7F0
  #define L2X0_CLEAN_INV_LINE_IDX               0x7F8
  #define L2X0_CLEAN_INV_WAY            0x7FC
 -#define L2X0_LOCKDOWN_WAY_D           0x900
 -#define L2X0_LOCKDOWN_WAY_I           0x904
 +/*
 + * The lockdown registers repeat 8 times for L310, the L210 has only one
 + * D and one I lockdown register at 0x0900 and 0x0904.
 + */
 +#define L2X0_LOCKDOWN_WAY_D_BASE      0x900
 +#define L2X0_LOCKDOWN_WAY_I_BASE      0x904
 +#define L2X0_LOCKDOWN_STRIDE          0x08
+ #define L2X0_ADDR_FILTER_START                0xC00
+ #define L2X0_ADDR_FILTER_END          0xC04
  #define L2X0_TEST_OPERATION           0xF00
  #define L2X0_LINE_DATA                        0xF10
  #define L2X0_LINE_TAG                 0xF30
@@@ -67,9 -64,17 +69,17 @@@
  #define L2X0_CACHE_ID_PART_L310               (3 << 6)
  
  #define L2X0_AUX_CTRL_MASK                    0xc0000fff
+ #define L2X0_AUX_CTRL_DATA_RD_LATENCY_SHIFT   0
+ #define L2X0_AUX_CTRL_DATA_RD_LATENCY_MASK    0x7
+ #define L2X0_AUX_CTRL_DATA_WR_LATENCY_SHIFT   3
+ #define L2X0_AUX_CTRL_DATA_WR_LATENCY_MASK    (0x7 << 3)
+ #define L2X0_AUX_CTRL_TAG_LATENCY_SHIFT               6
+ #define L2X0_AUX_CTRL_TAG_LATENCY_MASK                (0x7 << 6)
+ #define L2X0_AUX_CTRL_DIRTY_LATENCY_SHIFT     9
+ #define L2X0_AUX_CTRL_DIRTY_LATENCY_MASK      (0x7 << 9)
  #define L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT     16
  #define L2X0_AUX_CTRL_WAY_SIZE_SHIFT          17
 -#define L2X0_AUX_CTRL_WAY_SIZE_MASK           (0x3 << 17)
 +#define L2X0_AUX_CTRL_WAY_SIZE_MASK           (0x7 << 17)
  #define L2X0_AUX_CTRL_SHARE_OVERRIDE_SHIFT    22
  #define L2X0_AUX_CTRL_NS_LOCKDOWN_SHIFT               26
  #define L2X0_AUX_CTRL_NS_INT_CTRL_SHIFT               27

diff --cc arch/arm/kernel/Makefile
Simple merge

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

diff --cc arch/arm/mach-exynos4/platsmp.c
Simple merge

diff --cc arch/arm/mach-pxa/saar.c
Simple merge

diff --cc arch/arm/mm/cache-l2x0.c
Simple merge