OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/arch/arm/mach-sa1100
History
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
…
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
…
cpu-sa1110.c
…
dma.c
…
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
…
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
…
jornada720.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
jornada720_ssp.c
…
lart.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
leds-assabet.c
…
leds-badge4.c
…
leds-cerf.c
…
leds-hackkit.c
…
leds-lart.c
…
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
…
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
…
ssp.c
…
time.c ARM: 7269/1: mach-sa1100: fix sched_clock breakage 2012-01-05 13:23:02 +00:00