openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/arm/mach-spear6xx/include/mach
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
..
debug-macro.S ARM: 6011/1: ST SPEAr: Added basic header files for SPEAr6xx machine family 2010-04-14 11:31:58 +01:00
generic.h SPEAr: Add DT bindings for SPEAr's timer 2012-05-12 21:03:26 +02:00
gpio.h ARM: 6011/1: ST SPEAr: Added basic header files for SPEAr6xx machine family 2010-04-14 11:31:58 +01:00
hardware.h ARM: spear: remove most mach/*.h header contents 2012-04-22 22:44:04 +02:00
irqs.h SPEAr: Add DT bindings for SPEAr's timer 2012-05-12 21:03:26 +02:00
misc_regs.h Merge branch 'spear/dt' into spear/clock 2012-05-14 17:31:45 +02:00
spear.h SPEAr: Add DT bindings for SPEAr's timer 2012-05-12 21:03:26 +02:00
timex.h ARM: 6011/1: ST SPEAr: Added basic header files for SPEAr6xx machine family 2010-04-14 11:31:58 +01:00
uncompress.h ARM: 6011/1: ST SPEAr: Added basic header files for SPEAr6xx machine family 2010-04-14 11:31:58 +01:00