iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
a5f17d1f4c
linux/arch/arm/mach-sa1100
History
Olof Johansson a5f17d1f4c Linux 3.3-rc2 
.. several days delayed. No reason, I just didn't think of it.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJPKF4KAAoJEHm+PkMAQRiGw/YH+wXg2DpZUuHeBK52zMGlJBPc
 DzX11/Uan3Y07gM0JbDzuVxwjX4vdxR2bV6r1qsLP8JEUnE8jyFC32DBGi5WAht7
 F4KU/Uov2Ds5/wzvY4Iuo01C+JftQHXuy/Sbhck1d0LI0yjLejRaw+zuJv0x2/eS
 7YqV+KTGE1lDuJs/Gyq1Vqr1g9831AuS1tv/g3gaqBuN6TcPBFCocaVxzwrUc+y6
 94h26XbbOhQRIz38oqUkiqAGnvYS61ocyBcEiRHf0dXkNSDIINqlgukvd7YTXouA
 jj/w/DWpMRcQuYAgqkrurr9+yWC9hVQcsvvQ5sAQnIPcxoR868sg1pO8Oheq+1g=
 =kUzV
 -----END PGP SIGNATURE-----

Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc

There were conflicts between fixes going in after 3.3-rc1 and
Russell's stable arm-soc base branch. Resolving it in the dependency
branch so that each topic branch shares the same resolution.

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9g45.c
2012-02-07 15:05:20 -08:00
..
include/mach Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
assabet.c Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus." 2012-01-20 17:38:58 +00:00
badge4.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
cerf.c Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus." 2012-01-20 17:38:58 +00:00
clock.c Revert "ARM: sa1100: clean up of the clock support" 2012-01-19 11:58:31 +00:00
collie.c Merge branch 'sa11x0-mcp-fixes' into fixes 2012-01-26 21:06:54 +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 Merge branch 'sa11x0-mcp-fixes' into fixes 2012-01-26 21:06:54 +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_ssp.c ARM: 7288/1: mach-sa1100: add missing module_init() call 2012-01-23 10:21:38 +00:00
jornada720.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +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 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 arm/PCI: convert to pci_scan_root_bus() for correct root bus resources 2012-01-06 12:10:56 -08: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 Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus." 2012-01-20 17:38:58 +00:00
simpad.c Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus." 2012-01-20 17:38:58 +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