Merge branch 'misc' into for-next

Conflicts:
	arch/arm/mach-integrator/integrator_ap.c

diff --cc arch/arm/Kconfig
index 3a012100e8f1617e2218217a529f7dec50418bc8,1412da8ccf0599bea78497e10d2a6f138de60ef3..0143e2e029023074483ca4c873fceddc871ca4f1
--- 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/io.h
Simple merge

diff --cc arch/arm/include/asm/system.h
Simple merge

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc arch/arm/kernel/traps.c
Simple merge

diff --cc arch/arm/kernel/vmlinux.lds.S
index 4e66f62b8d41f7321b7dcdc58ec9bd8730afc775,7b2541efd9f8cc1980fc57422eb7d19b2a15f716..20b3041e0860f7c743f4e453a38c9ce738a10e75
--- 1/arch/arm/kernel/vmlinux.lds.S
--- 2/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@@ -21,12 -21,11 +21,13 @@@
  #define ARM_CPU_KEEP(x)
  #endif
  
- #if defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)
+ #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
+       defined(CONFIG_GENERIC_BUG)
  #define ARM_EXIT_KEEP(x)      x
 +#define ARM_EXIT_DISCARD(x)
  #else
  #define ARM_EXIT_KEEP(x)
 +#define ARM_EXIT_DISCARD(x)   x
  #endif
  
  OUTPUT_ARCH(arm)

diff --cc arch/arm/mach-integrator/integrator_ap.c
index 8cdc730dcb3a1bc273da69cc036c974f6cf34ca6,8dca5a7ab370f5ee29314351887fae7164c5f6c7..f2119908a0b336908223942b19c9dcf33ade342f
--- 1/arch/arm/mach-integrator/integrator_ap.c
--- 2/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@@ -32,7 -32,7 +32,8 @@@
  #include <linux/interrupt.h>
  #include <linux/io.h>
  #include <linux/mtd/physmap.h>
+ #include <linux/clk.h>
 +#include <video/vga.h>
  
  #include <mach/hardware.h>
  #include <mach/platform.h>

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

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

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