Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
66a2886d86
linux/arch/arm/mach-spear3xx/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: 6010/1: ST SPEAr: Added basic header files for SPEAr3xx machine family 2010-04-14 11:26:22 +01:00
generic.h Merge branch 'spear/dt' into spear/clock 2012-05-14 17:31:45 +02:00
gpio.h ARM: 6010/1: ST SPEAr: Added basic header files for SPEAr3xx machine family 2010-04-14 11:26:22 +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 Merge branch 'spear/dt' into spear/clock 2012-05-14 17:31:45 +02:00
timex.h ARM: 6010/1: ST SPEAr: Added basic header files for SPEAr3xx machine family 2010-04-14 11:26:22 +01:00
uncompress.h ARM: 6010/1: ST SPEAr: Added basic header files for SPEAr3xx machine family 2010-04-14 11:26:22 +01:00