android_kernel_motorola_sm6225/arch/arm/include/debug
Olof Johansson 3f54db784a Merge branch 'zynq/multiplatform' of git://git.monstr.eu/linux-2.6-microblaze into next/multiplatform
From Michal Simek:

This branch depends on arm-soc devel/debug_ll_init branch because
we needed Rob's "ARM: implement debug_ll_io_init()"
(sha1: afaee03511ba8002b26a9c6b1fe7d6baf33eac86)
patch.

This branch also depends on zynq/dt branch because of previous major
zynq changes.
zynq/cleanup branch is subset of zynq/dt.

* 'zynq/multiplatform' of git://git.monstr.eu/linux-2.6-microblaze:
  ARM: zynq: Remove all unused mach headers
  ARM: zynq: add support for ARCH_MULTIPLATFORM
  ARM: zynq: make use of debug_ll_io_init()
  ARM: zynq: remove TTC early mapping
  ARM: zynq: add clk binding support to the ttc
  ARM: zynq: use zynq clk bindings
  clk: Add support for fundamental zynq clks
  ARM: zynq: dts: split up device tree
  ARM: zynq: Allow UART1 to be used as DEBUG_LL console.
  ARM: zynq: dts: add description of the second uart
  ARM: zynq: move arm-specific sys_timer out of ttc
  zynq: move static peripheral mappings
  zynq: remove use of CLKDEV_LOOKUP
  zynq: use pl310 device tree bindings
  zynq: use GIC device tree bindings

Add/add conflict in arch/arm/Kconfig.debug.

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-11-21 11:49:45 -08:00
..
8250_32.S ARM: socfpga: Fix socfpga compilation with early_printk() enabled 2012-10-25 16:52:53 +02:00
highbank.S ARM: highbank: move debug macros to include/debug 2012-09-14 09:22:01 -05:00
icedcc.S ARM: move debug macros to common location 2012-09-14 09:22:00 -05:00
mvebu.S ARM: mvebu: move debug macros to include/debug 2012-09-14 09:22:02 -05:00
picoxcell.S ARM: socfpga: Fix socfpga compilation with early_printk() enabled 2012-10-25 16:52:53 +02:00
socfpga.S ARM: socfpga: Fix socfpga compilation with early_printk() enabled 2012-10-25 16:52:53 +02:00
tegra.S ARM: tegra: move debug-macro.S to include/debug 2012-11-16 12:22:18 -07:00
vexpress.S ARM: vexpress: move debug macros to include/debug 2012-09-14 09:22:01 -05:00
zynq.S ARM: zynq: add support for ARCH_MULTIPLATFORM 2012-11-21 10:52:13 +01:00