linux/arch/arm/mach-prima2
Arnd Bergmann 6e1d521b9d Merge branches 'depends/irqdomain' and 'at91/base2+cleanup' into next/dt
These two branches are a dependency for the at91 device tree changes,
so we pull them in here. at91/base2+cleanup will get merged through
the arm-soc cleanup2 branch, while the irqdomain tree will be sent
by Grant before this one gets integrated.

Conflicts:
	drivers/rtc/rtc-at91sam9.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-02 13:22:19 +00:00
..
include/mach ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
clock.c ARM: CSR: clock: Fix indentation 2011-10-01 09:40:44 +08:00
common.h ARM: restart: prima2: use new restart hook 2012-01-05 12:57:17 +00:00
irq.c irq_domain: Remove irq_domain_add_simple() 2012-02-16 06:11:23 -07:00
l2x0.c ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII 2011-10-24 02:54:21 -07:00
lluart.c ARM: CSR: mapping early DEBUG_LL uart 2011-07-09 07:20:51 +08:00
Makefile ARM: CSR: PM: add sleep entry for SiRFprimaII 2011-09-21 23:25:59 +08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pm.c ARM: CSR: PM: fix build error due to undeclared 'THIS_MODULE' 2011-12-02 11:03:41 +08:00
pm.h ARM: CSR: PM: add sleep entry for SiRFprimaII 2011-09-21 23:25:59 +08:00
prima2.c ARM: restart: prima2: use new restart hook 2012-01-05 12:57:17 +00:00
rstc.c ARM: restart: prima2: use new restart hook 2012-01-05 12:57:17 +00:00
rtciobrg.c ARM: CSR: add rtc i/o bridge interface for SiRFprimaII 2011-09-11 09:17:53 +08:00
sleep.S ARM: CSR: PM: add sleep entry for SiRFprimaII 2011-09-21 23:25:59 +08:00
timer.c Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:22:01 -07:00