Merge branches 'depends/rmk/io', 'depends/rmk/l2x0' and 'depends/rmk/gpio' into highb...

diff --cc arch/arm/Kconfig
index 3146ed3f6eca01a42068454e31f53a3330cc12c6,2c71a8f3535a1400c2d187e7fa612e00995e6927,3269576dbfa8dab12d6531996e2e86de2ca309c1,05589e85c1804d481a6f84e058c9b0e096677d73..4792d2928fa3a8aa2edaefa1f0b53ca27798a379
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
--- 4/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@ -1271,32 -1272,6 -1271,18 -1273,6 +1272,32 @@@@@ config ARM_ERRATA_75432
          This workaround defines cpu_relax() as smp_mb(), preventing correctly
          written polling loops from denying visibility of updates to memory.
    
 + +config ARM_ERRATA_364296
 + +    bool "ARM errata: Possible cache data corruption with hit-under-miss enabled"
 + +    depends on CPU_V6 && !SMP
 + +    help
 + +      This options enables the workaround for the 364296 ARM1136
 + +      r0p2 erratum (possible cache data corruption with
 + +      hit-under-miss enabled). It sets the undocumented bit 31 in
 + +      the auxiliary control register and the FI bit in the control
 + +      register, thus disabling hit-under-miss without putting the
 + +      processor into full low interrupt latency mode. ARM11MPCore
 + +      is not affected.
 + +
 +++config ARM_ERRATA_764369
 +++    bool "ARM errata: Data cache line maintenance operation by MVA may not succeed"
 +++    depends on CPU_V7 && SMP
 +++    help
 +++      This option enables the workaround for erratum 764369
 +++      affecting Cortex-A9 MPCore with two or more processors (all
 +++      current revisions). Under certain timing circumstances, a data
 +++      cache line maintenance operation by MVA targeting an Inner
 +++      Shareable memory region may fail to proceed up to either the
 +++      Point of Coherency or to the Point of Unification of the
 +++      system. This workaround adds a DSB instruction before the
 +++      relevant cache maintenance functions and sets a specific bit
 +++      in the diagnostic control register of the SCU.
 +++
    endmenu
    
    source "arch/arm/common/Kconfig"

diff --cc arch/arm/mach-mmp/gplugd.c
index 98e25d9aaab61ea9c4865d6130fafa0e35d8134b,c070c24255f43562c1d434c1ee35d33951e43f0c,98e25d9aaab61ea9c4865d6130fafa0e35d8134b,ef738deb20b5f4ba259cb8c57e7386aa01fb3be8..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
+++ b/arch/arm/mach-mmp/gplugd.c
@@@@@ -13,9 -13,10 -13,9 -14,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-orion5x/dns323-setup.c
Simple merge

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