forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-pinenote/arch/arm/mach-spear3xx
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/mach 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
Makefile.boot ARM: SPEAr3xx: Add device-tree support to SPEAr3xx architecture 2012-04-22 22:41:35 +02:00
spear3xx.c Merge branch 'spear/dt' into spear/clock 2012-05-14 17:31:45 +02:00
spear300.c Merge branch 'spear/dt' into spear/clock 2012-05-14 17:31:45 +02:00
spear310.c Merge branch 'spear/dt' into spear/clock 2012-05-14 17:31:45 +02:00
spear320.c Merge branch 'spear/dt' into spear/clock 2012-05-14 17:31:45 +02:00