Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc

* 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc:
  arm/imx: use Kconfig choice for low-level debug UART selection
  ARM: realview: use Kconfig choice for debug UART selection
  ARM: plat-samsung: use Kconfig choice for debug UART selection
  ARM: versatile: convert logical CPU numbers to physical numbers
  ARM: ux500: convert logical CPU numbers to physical numbers
  ARM: shmobile: convert logical CPU numbers to physical numbers
  ARM: msm: convert logical CPU numbers to physical numbers
  ARM: exynos4: convert logical CPU numbers to physical numbers

Fix up trivial conflict (config DEBUG_S3C_UART move/split vs addition of
ARM_KPROBES_TEST option) in arch/arm/Kconfig.debug

diff --cc arch/arm/Kconfig.debug
index f283938,5bc7814..64db5b1
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -146,22 -251,4 +251,10 @@@ config OC_ET
          buffer driver that will allow you to collect traces of the
          kernel code.
  
- config DEBUG_S3C_UART
-       depends on PLAT_SAMSUNG
-       int "S3C UART to use for low-level debug"
-       default "0"
-       help
-         Choice for UART for kernel low-level using S3C UARTS,
-         should be between zero and two. The port must have been
-         initialised by the boot-loader before use.
- 
-         The uncompressor code port configuration is now handled
-         by CONFIG_S3C_LOWLEVEL_UART_PORT.
- 
 +config ARM_KPROBES_TEST
 +      tristate "Kprobes test module"
 +      depends on KPROBES && MODULES
 +      help
 +        Perform tests of kprobes API and instruction set simulation.
 +
  endmenu

diff --cc arch/arm/mach-exynos4/platsmp.c
Simple merge

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

diff --cc arch/arm/mach-mxs/include/mach/debug-macro.S
Simple merge

diff --cc arch/arm/mach-realview/include/mach/debug-macro.S
Simple merge

diff --cc arch/arm/mach-ux500/platsmp.c
Simple merge

diff --cc arch/arm/mach-vexpress/hotplug.c
index 3668cf9,2866ed8..813ee08
--- 1/arch/arm/mach-vexpress/hotplug.c
--- 2/arch/arm/mach-vexpress/hotplug.c
+++ b/arch/arm/mach-vexpress/hotplug.c
@@@ -63,9 -62,15 +63,9 @@@ static inline void platform_do_lowpower
         * code will have already disabled interrupts
         */
        for (;;) {
 -              /*
 -               * here's the WFI
 -               */
 -              asm(".word      0xe320f003\n"
 -                  :
 -                  :
 -                  : "memory", "cc");
 +              wfi();
  
-               if (pen_release == cpu) {
+               if (pen_release == cpu_logical_map(cpu)) {
                        /*
                         * OK, proper wakeup, we're done
                         */

diff --cc arch/arm/plat-mxc/include/mach/debug-macro.S
Simple merge

diff --cc arch/arm/plat-samsung/Kconfig
Simple merge