Merge branch 'misc' into for-next

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

diff --cc arch/arm/Kconfig
index 36cd2ea6472bdf623fbf27ac8126259ac67d6410,c7a76421ba2c3d113d983ca73b09816f9df0dec9..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/Kconfig.debug
index 0c7a4f52d2b37a6f3e45fa2fab7bc8570bb63a04,b3dc1fa30848c17725227aee44eaefe17e2f5485..df3eb3ccd7693564cf72098d107b29cc055c8d2a
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -80,21 -138,9 +138,9 @@@ config EARLY_PRINT
          kernel low-level debugging functions. Add earlyprintk to your
          kernel parameters to enable this console.
  
- config DEBUG_ICEDCC
-       bool "Kernel low-level debugging via EmbeddedICE DCC channel"
-       depends on DEBUG_LL
-       help
-         Say Y here if you want the debug print routines to direct their
-         output to the EmbeddedICE macrocell's DCC channel using
-         co-processor 14. This is known to work on the ARM9 style ICE
-         channel and on the XScale with the PEEDI.
- 
-         It does include a timeout to ensure that the system does not
-         totally freeze when there is nothing connected to read.
- 
  config OC_ETM
        bool "On-chip ETM and ETB"
 -      select ARM_AMBA
 +      depends on ARM_AMBA
        help
          Enables the on-chip embedded trace macrocell and embedded trace
          buffer driver that will allow you to collect traces of the

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

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

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

diff --cc arch/arm/kernel/smp_scu.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-pxa/irq.c
index d493a230addf17ee47ebdcbe9ec9ea216b035c6c,ca607571782426bd05ecc087b8644563c196ec64..8d9200f922680d9c84d491d78fe39d1f28618cc5
--- 1/arch/arm/mach-pxa/irq.c
--- 2/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@@ -18,9 -19,11 +18,11 @@@
  #include <linux/io.h>
  #include <linux/irq.h>
  
+ #include <asm/exception.h>
+ 
  #include <mach/hardware.h>
  #include <mach/irqs.h>
 -#include <mach/gpio.h>
 +#include <mach/gpio-pxa.h>
  
  #include "generic.h"
  

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