Merge branch 'cross-platform/debug_ll' into imx/imx6q

Conflicts:
	arch/arm/Kconfig.debug

diff --cc arch/arm/Kconfig.debug
index 0887801c324f6cd153e90f039adb32c80a470bb4,5bc7814d9a3d345b8a0a7bea6278bc5803334dcd..13c0631e6e951c845066ca85ad7555048d06072d
--- 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-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/plat-mxc/include/mach/debug-macro.S
Simple merge