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

diff --cc arch/arm/Kconfig
index 3269576dbfa8dab12d6531996e2e86de2ca309c1,2c71a8f3535a1400c2d187e7fa612e00995e6927,05589e85c1804d481a6f84e058c9b0e096677d73,2c71a8f3535a1400c2d187e7fa612e00995e6927,272eadc7a12cc552497dd3ad437c0ed76f7438a1,5ebc5d922ea14984e10ef8e10f47d414469efa7c,3269576dbfa8dab12d6531996e2e86de2ca309c1..824c469c553724398b58b48d7b0900e5025e35bb
--- 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
+++ b/arch/arm/Kconfig
@@@@@@@@ -195,7 -195,8 -195,8 -195,8 -195,8 -195,7 -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/kernel/head.S
Simple merge

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

diff --cc arch/arm/mach-orion5x/dns323-setup.c
Simple merge

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