kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux-hardened/arch/arm/plat-spear
History
Arnd Bergmann d2819f80d4 Merge branch 'spear/pinctrl' into spear/clock 
Conflicts:
	arch/arm/mach-spear3xx/Makefile
	arch/arm/mach-spear3xx/clock.c
	arch/arm/mach-spear3xx/include/mach/generic.h
	arch/arm/mach-spear6xx/clock.c
	arch/arm/plat-spear/Makefile
	drivers/pinctrl/core.c

This resolves some annoying merge conflicts.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14 15:33:42 +02:00
..
include/plat Merge branch 'spear/pinctrl' into spear/clock 2012-05-14 15:33:42 +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 SPEAr: Add PL080 DMA support for 3xx and 6xx 2012-04-22 22:41:35 +02:00
restart.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
shirq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
time.c SPEAr: Call clk_prepare() before calling clk_enable 2012-05-12 21:19:28 +02:00