2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 20:53:53 +08:00
linux-next/arch/arm/mach-prima2
Russell King 7b9dd47136 Merge branch 'restart' into for-linus
Conflicts:
	arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
2012-01-05 13:25:27 +00:00
..
include/mach Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00: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 ARM: CSR: PM: save/restore irq status in suspend cycle 2011-09-21 22:52:58 +08: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