leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40ba95fdf1
linux/arch/arm/mach-picoxcell
History
Arnd Bergmann 40ba95fdf1 Merge branch 'depends/rmk/restart' into next/cleanup 
Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-at91/at91sam9rl.c
	arch/arm/mach-exynos/cpu.c
	arch/arm/mach-shmobile/board-kota2.c

This resolves a bunch of conflicts between the arm-soc tree
and changes from the arm tree that have gone upstream.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-07 11:51:28 +00:00
..
include/mach Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
common.c ARM: picoxcell: move io mappings to common.c 2011-12-18 10:48:20 +00:00
common.h ARM: picoxcell: move io mappings to common.c 2011-12-18 10:48:20 +00:00
Makefile ARM: picoxcell: move io mappings to common.c 2011-12-18 10:48:20 +00:00
Makefile.boot
time.c