linux_old1/arch/arm/mach-sa1100
Arnd Bergmann dcf7ec5ee6 Merge branch 'samsung/driver' into next/drivers
Conflicts:
	arch/arm/mach-mxs/include/mach/common.h

Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-09 16:16:29 +00:00
..
include/mach Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
Kconfig ARM: 6459/2: sa1100: Add nanoEngine PCI support. 2010-12-21 14:53:46 +00: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
assabet.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
badge4.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
cerf.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
clock.c ARM: sa1100: clean up of the clock support 2011-12-28 10:42:48 +00:00
collie.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
cpu-sa1100.c Fix common misspellings 2011-03-31 11:26:23 -03: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 Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
generic.h ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
h3xxx.c ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request 2009-12-06 16:52:58 +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: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
irq.c ARM / SA1100: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
jornada720.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
jornada720_ssp.c Fix common misspellings 2011-03-31 11:26:23 -03:00
lart.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +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
nanoengine.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
neponset.c arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
pci-nanoengine.c mach-sa1100: fix PCI build problem 2011-08-10 16:00:48 +00:00
pleb.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
pm.c ARM: pm: allow suspend finisher to return error codes 2011-07-02 09:54:01 +01:00
shannon.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
simpad.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
sleep.S ARM: pm: sa1100: move cpu_suspend into C code 2011-06-24 08:48:43 +01: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