Arnd Bergmann a94c7b0a8f Merge branch 'spear/dt' into next/dt2 ...

* spear/dt:
  ARM: SPEAr600: Add device-tree support to SPEAr600 boards

(update to v3.3-rc7)

Conflicts:
	arch/arm/mach-spear6xx/spear6xx.c
	arch/arm/mach-vexpress/Kconfig

The conflicts are between the previous contents of the next/dt2
branch and upstream changes from v3.3-rc7.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-03-16 20:25:17 +00:00

..

include/mach

Merge branch 'ux500/dt' into next/dt2

2012-03-16 19:51:30 +00:00

board-mop500-pins.c

Merge branch 'next/fixes' into next/cleanup

2011-10-31 23:25:41 +01:00

board-mop500-regulators.c

Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

2011-07-26 17:41:04 -07:00

board-mop500-regulators.h

mach-ux500: configure board for the TPS61052 regulator v2

2011-03-28 08:54:23 +02:00

board-mop500-sdi.c

ARM: ux500: pass parent pointer to each platform device

2012-02-13 06:31:29 +00:00

board-mop500-stuib.c

mach-ux500: basic HREFv60 support v2

2011-03-14 14:05:16 +01:00

board-mop500-u8500uib.c

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h

2011-08-08 14:27:41 +01:00

board-mop500-uib.c

mach-x500: fix SECTION warnings in uib

2011-06-22 13:26:49 +02:00

board-mop500.c

ARM: ux500: Enable PL022 SSP Controller in Device Tree

2012-03-16 19:48:47 +00:00

board-mop500.h

ARM: ux500: pass parent pointer to each platform device

2012-02-13 06:31:29 +00:00

board-u5500-sdi.c

ARM: ux500: pass parent pointer to each platform device

2012-02-13 06:31:29 +00:00

board-u5500.c

ARM: ux500: move top level platform devices in sysfs to /sys/devices/socX

2012-02-13 06:31:44 +00:00

cache-l2x0.c

ARM: ux500: Enable PL310 Level 2 Cache Controller in Device Tree

2012-03-16 19:48:46 +00:00

clock.c

ARM: ux500: fix the smp_twd clock calculation

2011-12-19 00:35:08 +01:00

clock.h

ux500: add debugfs support for powerdebug

2010-12-20 13:32:45 +01:00

cpu-db5500.c

ARM: ux500: move top level platform devices in sysfs to /sys/devices/socX

2012-02-13 06:31:44 +00:00

cpu-db8500.c

ARM: ux500: move top level platform devices in sysfs to /sys/devices/socX

2012-02-13 06:31:44 +00:00

cpu.c

ARM: ux500: Enable Cortex-A9 GIC (Generic Interrupt Controller) in Device Tree

2012-03-16 19:48:31 +00:00

devices-common.c

Merge branch 'ux500/dt' into next/dt2

2012-03-16 19:51:30 +00:00

devices-common.h

ARM: ux500: remove intermediary add_platform_device* functions

2012-02-13 06:31:53 +00:00

devices-db5500.h

ARM: ux500: pass parent pointer to each platform device

2012-02-13 06:31:29 +00:00

devices-db8500.c

ARM: ux500: remove support for early silicon revisions

2011-12-19 00:35:07 +01:00

devices-db8500.h

ARM: ux500: remove intermediary add_platform_device* functions

2012-02-13 06:31:53 +00:00

devices.c

ux500: rework device registration

2010-12-08 13:14:06 +01:00

dma-db5500.c

ARM: ux500: pass parent pointer to each platform device

2012-02-13 06:31:29 +00:00

headsmp.S

ARM: ux500: add missing ENDPROC to headsmp.S

2012-01-16 08:36:03 -06:00

hotplug.c

ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP

2012-01-23 10:20:05 +00:00

id.c

ARM: ux500: support DB8520

2011-12-19 00:35:05 +01:00

Kconfig

Merge branch 'spear/dt' into next/dt2

2012-03-16 20:25:17 +00:00

Makefile

ARM: ux500: convert to twd_local_timer_register() interface

2012-03-13 13:45:33 +00:00

Makefile.boot

ARM: ux500: Initial Device Tree support for Snowball

2012-03-16 19:46:12 +00:00

mbox-db5500.c

treewide: Fix iomap resource size miscalculations

2011-04-10 17:01:04 +02:00

modem-irq-db5500.c

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

pins-db5500.h

ARM: 6371/1: ux500: add DB5500 pins

2010-09-19 12:12:26 +01:00

pins-db8500.h

mach-ux500: remove pull-pinconfig and add SPI2

2011-08-30 09:23:11 +02:00

platsmp.c

ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP

2012-01-23 10:20:05 +00:00

ste-dma40-db5500.h

ARM: 6372/1: ux500: add DB5500 DMA event lines

2010-09-19 12:12:27 +01:00

ste-dma40-db8500.h

ARM: 6418/1: ux500: rename DB8500 DMA event line macros

2010-10-04 19:46:07 +01:00

timer.c

ARM: ux500: Provide local timer support for Device Tree

2012-03-16 19:48:48 +00:00

usb.c

ARM: ux500: move top level platform devices in sysfs to /sys/devices/socX

2012-02-13 06:31:44 +00:00