Merge branches 'amba', 'arnd-randcfg-fixes', 'clk', 'fixes', 'gpio', 'io' (early...

diff --cc arch/arm/Kconfig
index 3146ed3f6eca01a42068454e31f53a3330cc12c6,ed69fcde83edada58cdbae3afbfeb626bb297621,5ebc5d922ea14984e10ef8e10f47d414469efa7c,3146ed3f6eca01a42068454e31f53a3330cc12c6,05589e85c1804d481a6f84e058c9b0e096677d73,2c71a8f3535a1400c2d187e7fa612e00995e6927,272eadc7a12cc552497dd3ad437c0ed76f7438a1,5ebc5d922ea14984e10ef8e10f47d414469efa7c..36cd2ea6472bdf623fbf27ac8126259ac67d6410
--- 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,7 -195,7 -195,7 -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/io.h
Simple merge

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

diff --cc arch/arm/mach-mmp/gplugd.c
index 98e25d9aaab61ea9c4865d6130fafa0e35d8134b,98e25d9aaab61ea9c4865d6130fafa0e35d8134b,98e25d9aaab61ea9c4865d6130fafa0e35d8134b,98e25d9aaab61ea9c4865d6130fafa0e35d8134b,ef738deb20b5f4ba259cb8c57e7386aa01fb3be8,c070c24255f43562c1d434c1ee35d33951e43f0c,c070c24255f43562c1d434c1ee35d33951e43f0c,98e25d9aaab61ea9c4865d6130fafa0e35d8134b..32776f3739f1d8d2e34cf378eb28cda687d19550
--- 1/arch/arm/mach-mmp/gplugd.c
--- 2/arch/arm/mach-mmp/gplugd.c
--- 3/arch/arm/mach-mmp/gplugd.c
--- 4/arch/arm/mach-mmp/gplugd.c
--- 5/arch/arm/mach-mmp/gplugd.c
--- 6/arch/arm/mach-mmp/gplugd.c
--- 7/arch/arm/mach-mmp/gplugd.c
--- 8/arch/arm/mach-mmp/gplugd.c
+++ b/arch/arm/mach-mmp/gplugd.c
@@@@@@@@@ -13,9 -13,9 -13,9 -13,9 -14,9 -13,10 -13,10 -13,9 +14,8 @@@@@@@@@
        #include <asm/mach/arch.h>
        #include <asm/mach-types.h>
        
---- ---#include <mach/gpio.h>
        #include <mach/pxa168.h>
        #include <mach/mfp-pxa168.h>
    --- #include <mach/mfp-gplugd.h>
        
        #include "common.h"
        

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

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

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

diff --cc arch/arm/mm/proc-v7.S
Simple merge

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