leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2795343705
linux/arch/arm/plat-spear
History
Arnd Bergmann 66a2886d86 Merge branch 'spear/dt' into spear/clock 
Conflicts:
	arch/arm/mach-spear3xx/clock.c
	arch/arm/mach-spear3xx/include/mach/generic.h
	arch/arm/mach-spear3xx/include/mach/misc_regs.h
	arch/arm/mach-spear3xx/spear320.c
	arch/arm/mach-spear6xx/clock.c
	arch/arm/mach-spear6xx/include/mach/misc_regs.h

Resolve even more merge conflicts.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14 17:31:45 +02:00
..
include/plat Merge branch 'spear/dt' into spear/clock 2012-05-14 17:31:45 +02:00
Kconfig SPEAr3xx: Add pinctrl support for boards 2012-04-22 22:49:28 +02:00
Makefile Merge branch 'spear/pinctrl' into spear/clock 2012-05-14 15:33:42 +02:00
pl080.c ARM: spear: remove most mach/*.h header contents 2012-04-22 22:44:04 +02:00
restart.c ARM: spear: remove most mach/*.h header contents 2012-04-22 22:44:04 +02:00
shirq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
time.c Merge branch 'spear/dt' into spear/clock 2012-05-14 17:31:45 +02:00