Merge branches 'amba', 'fixes', 'gpio', 'io' (early part), 'misc', 'p2v' and 'pgt...

diff --cc arch/arm/Kconfig
index 5ebc5d922ea14984e10ef8e10f47d414469efa7c,2c71a8f3535a1400c2d187e7fa612e00995e6927,3269576dbfa8dab12d6531996e2e86de2ca309c1,2c71a8f3535a1400c2d187e7fa612e00995e6927,2c71a8f3535a1400c2d187e7fa612e00995e6927,ac1ba259c07feb904bc414537bd5e0fb183f2d94,272eadc7a12cc552497dd3ad437c0ed76f7438a1,5ebc5d922ea14984e10ef8e10f47d414469efa7c..63cbd866453b6632c8fb3b9598a124ace5b96300
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
--- 4/arch/arm/Kconfig
--- 5/arch/arm/Kconfig
--- 6/arch/arm/Kconfig
--- 7/arch/arm/Kconfig
--- 8/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@@@@@ -195,7 -195,8 -195,7 -195,8 -195,8 -195,8 -195,8 -195,7 +195,8 @@@@@@@@@ config VECTORS_BAS
                  The base address of exception vectors.
        
        config ARM_PATCH_PHYS_VIRT
- -    -        bool "Patch physical to virtual translations at runtime"
 - ---          bool "Patch physical to virtual translations at runtime (EXPERIMENTAL)"
 - ---          depends on EXPERIMENTAL
++++++ +        bool "Patch physical to virtual translations at runtime" if EMBEDDED
++++++ +        default y
                depends on !XIP_KERNEL && MMU
                depends on !ARCH_REALVIEW || !SPARSEMEM
                help

diff --cc arch/arm/include/asm/hardware/cache-l2x0.h
index 16bd48031583da44b7c0f25c68027fd787dc3fe1,16bd48031583da44b7c0f25c68027fd787dc3fe1,bfa706ffd9683966dec63406c35e2e71942bd294,16bd48031583da44b7c0f25c68027fd787dc3fe1,16bd48031583da44b7c0f25c68027fd787dc3fe1,8fe149f2fcf3944cd1db3595c4faa3be25855a8b,16bd48031583da44b7c0f25c68027fd787dc3fe1,16bd48031583da44b7c0f25c68027fd787dc3fe1..4a6004a86a12c6728c46c8da5120d329e8bb39c0
--- 1/arch/arm/include/asm/hardware/cache-l2x0.h
--- 2/arch/arm/include/asm/hardware/cache-l2x0.h
--- 3/arch/arm/include/asm/hardware/cache-l2x0.h
--- 4/arch/arm/include/asm/hardware/cache-l2x0.h
--- 5/arch/arm/include/asm/hardware/cache-l2x0.h
--- 6/arch/arm/include/asm/hardware/cache-l2x0.h
--- 7/arch/arm/include/asm/hardware/cache-l2x0.h
--- 8/arch/arm/include/asm/hardware/cache-l2x0.h
+++ b/arch/arm/include/asm/hardware/cache-l2x0.h
@@@@@@@@@ -62,9 -62,9 -62,9 -62,9 -62,9 -64,17 -62,9 -62,9 +64,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/head.S
Simple merge

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

diff --cc arch/arm/mach-mmp/aspenite.c
Simple merge

diff --cc arch/arm/mach-msm/board-msm7x30.c
Simple merge

diff --cc drivers/tty/serial/atmel_serial.c
Simple merge