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

diff --cc arch/arm/Kconfig
index 3269576dbfa8dab12d6531996e2e86de2ca309c1,2c71a8f3535a1400c2d187e7fa612e00995e6927,05589e85c1804d481a6f84e058c9b0e096677d73,2c71a8f3535a1400c2d187e7fa612e00995e6927,c7a76421ba2c3d113d983ca73b09816f9df0dec9,272eadc7a12cc552497dd3ad437c0ed76f7438a1,5ebc5d922ea14984e10ef8e10f47d414469efa7c,3269576dbfa8dab12d6531996e2e86de2ca309c1..c932ae3bdfbd7fd509c7f2ff0ab2904e791d870b
--- 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,8 -195,8 -195,7 -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
@@@@@@@@@ -204,17 -205,17 -205,17 -205,17 -204,21 -205,13 -204,17 -204,17 +205,17 @@@@@@@@@
                  kernel in system memory.
        
                  This can only be used with non-XIP MMU kernels where the base
----- --          of physical memory is at a 16MB boundary, or theoretically 64K
----- --          for the MSM machine class.
+++++ ++          of physical memory is at a 16MB boundary.
+++++ ++
+++++ ++          Only disable this option if you know that you do not require
+++++ ++          this feature (eg, building a kernel for a single machine) and
+++++ ++          you need to shrink the kernel to the minimal size.
++++   +
    - - config ARM_PATCH_PHYS_VIRT_16BIT
    -           def_bool y
    -           depends on ARM_PATCH_PHYS_VIRT && ARCH_MSM
    -           help
    -             This option extends the physical to virtual translation patching
    -             to allow physical memory down to a theoretical minimum of 64K
    -             boundaries.
      + 
----   -config ARM_PATCH_PHYS_VIRT_16BIT
++++ +++config GENERIC_BUG
     +          def_bool y
----  --        depends on ARM_PATCH_PHYS_VIRT && ARCH_MSM
----  --        help
----  --          This option extends the physical to virtual translation patching
----  --          to allow physical memory down to a theoretical minimum of 64K
----  --          boundaries.
++++ +++        depends on BUG
     +  
        source "init/Kconfig"
        
        source "kernel/Kconfig.freezer"

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

diff --cc arch/arm/kernel/head.S
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 arch/arm/mach-orion5x/dns323-setup.c
Simple merge

diff --cc arch/arm/mach-sa1100/Makefile
Simple merge

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