Merge branch 'misc' into for-next

Conflicts:
	arch/arm/include/asm/hardware/cache-l2x0.h

diff --cc arch/arm/Kconfig
index 824c469c553724398b58b48d7b0900e5025e35bb,c7a76421ba2c3d113d983ca73b09816f9df0dec9..c932ae3bdfbd7fd509c7f2ff0ab2904e791d870b
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -205,13 -204,21 +205,17 @@@ config ARM_PATCH_PHYS_VIR
          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 GENERIC_BUG
+       def_bool y
+       depends on BUG
+ 
  source "init/Kconfig"
  
  source "kernel/Kconfig.freezer"

diff --cc arch/arm/include/asm/hardware/cache-l2x0.h
index 99a6ed7e1bfd5ce6395ca7a900079ada255da281,4a6004a86a12c6728c46c8da5120d329e8bb39c0..c48cb1e1c46cd02a536e83a9a1acb49b439fa531
--- 1/arch/arm/include/asm/hardware/cache-l2x0.h
--- 2/arch/arm/include/asm/hardware/cache-l2x0.h
+++ b/arch/arm/include/asm/hardware/cache-l2x0.h
@@@ -45,13 -45,10 +45,15 @@@
  #define L2X0_CLEAN_INV_LINE_PA                0x7F0
  #define L2X0_CLEAN_INV_LINE_IDX               0x7F8
  #define L2X0_CLEAN_INV_WAY            0x7FC
 -#define L2X0_LOCKDOWN_WAY_D           0x900
 -#define L2X0_LOCKDOWN_WAY_I           0x904
 +/*
 + * The lockdown registers repeat 8 times for L310, the L210 has only one
 + * D and one I lockdown register at 0x0900 and 0x0904.
 + */
 +#define L2X0_LOCKDOWN_WAY_D_BASE      0x900
 +#define L2X0_LOCKDOWN_WAY_I_BASE      0x904
 +#define L2X0_LOCKDOWN_STRIDE          0x08
+ #define L2X0_ADDR_FILTER_START                0xC00
+ #define L2X0_ADDR_FILTER_END          0xC04
  #define L2X0_TEST_OPERATION           0xF00
  #define L2X0_LINE_DATA                        0xF10
  #define L2X0_LINE_TAG                 0xF30

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

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

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

diff --cc arch/arm/mm/cache-l2x0.c
Simple merge