linux/arch/arm/mach-sa1100
Russell King 374da9da22 Merge branch 'sa1111' into sa11x0
Conflicts:
	arch/arm/common/sa1111.c
	arch/arm/mach-sa1100/neponset.c

Fixed:
	arch/arm/mach-sa1100/assabet.c
for the neponset changes
2012-03-25 23:54:16 +01:00
..
include/mach ARM: sa11x0: neponset: move register definitions to neponset.c 2012-02-09 15:34:17 +00:00
assabet.c Merge branch 'sa1111' into sa11x0 2012-03-25 23:54:16 +01:00
badge4.c Merge branch 'sa1111' into sa11x0 2012-03-25 23:54:16 +01:00
cerf.c ARM: sa11x0: convert to use DEFINE_RES_xxx macros 2012-02-09 15:34:12 +00:00
clock.c Revert "ARM: sa1100: clean up of the clock support" 2012-01-19 11:58:31 +00:00
collie.c ARM: sa11x0: convert to use DEFINE_RES_xxx macros 2012-02-09 15:34:12 +00:00
cpu-sa1100.c ARM: sa11x0: fix section mismatch in cpu-sa1100.c 2012-01-19 17:26:28 +00:00
cpu-sa1110.c ARM: 6451/1: sa1100: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1110.c. 2010-12-21 14:53:39 +00:00
dma.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
generic.c ARM: sa11x0: convert to use DEFINE_RES_xxx macros 2012-02-09 15:34:12 +00:00
generic.h ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
h3xxx.c ARM: sa11x0: convert to use DEFINE_RES_xxx macros 2012-02-09 15:34:12 +00:00
h3100.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
h3600.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
hackkit.c ARM: sa11x0: convert to use DEFINE_RES_xxx macros 2012-02-09 15:34:12 +00:00
irq.c ARM: sa11x0: convert to use DEFINE_RES_xxx macros 2012-02-09 15:34:12 +00:00
jornada720.c Merge branch 'sa1111' into sa11x0 2012-03-25 23:54:16 +01:00
jornada720_ssp.c ARM: 7288/1: mach-sa1100: add missing module_init() call 2012-01-23 10:21:38 +00:00
Kconfig ARM: 6459/2: sa1100: Add nanoEngine PCI support. 2010-12-21 14:53:46 +00:00
lart.c Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus." 2012-01-20 17:38:58 +00:00
leds-assabet.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-badge4.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-cerf.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-hackkit.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-lart.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds.c ARM: 7026/1: simpad: replace ARM specific LED code 2011-10-17 09:12:42 +01:00
leds.h ARM: 7026/1: simpad: replace ARM specific LED code 2011-10-17 09:12:42 +01:00
Makefile Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-27 08:39:10 +02:00
Makefile.boot ARM: sa1100: fix build error 2011-12-08 14:55:57 +08:00
nanoengine.c ARM: sa11x0: convert to use DEFINE_RES_xxx macros 2012-02-09 15:34:12 +00:00
neponset.c Merge branch 'sa1111' into sa11x0 2012-03-25 23:54:16 +01:00
pci-nanoengine.c ARM: sa11x0: convert to use DEFINE_RES_xxx macros 2012-02-09 15:34:12 +00:00
pleb.c ARM: sa11x0: convert to use DEFINE_RES_xxx macros 2012-02-09 15:34:12 +00:00
pm.c ARM: pm: allow suspend finisher to return error codes 2011-07-02 09:54:01 +01:00
shannon.c ARM: sa11x0: convert to use DEFINE_RES_xxx macros 2012-02-09 15:34:12 +00:00
simpad.c ARM: sa11x0: convert to use DEFINE_RES_xxx macros 2012-02-09 15:34:12 +00:00
sleep.S ARM: sa11x0: fix sleep entry 2012-02-09 15:34:11 +00:00
ssp.c [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
time.c ARM: 7269/1: mach-sa1100: fix sched_clock breakage 2012-01-05 13:23:02 +00:00