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	ARM: big removal of now unused arch_idle()	2012-01-20 19:25:58 -05:00
Makefile	ARM: highbank: add suspend support	2011-10-31 14:14:05 +01:00
Makefile.boot	ARM: add Highbank core platform support	2011-10-31 14:14:00 +01:00
clock.c	ARM: add Highbank core platform support	2011-10-31 14:14:00 +01:00
core.h	ARM: restart: highbank: use new restart hook	2012-01-05 12:57:12 +00:00
highbank.c	ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP	2012-01-23 10:20:05 +00:00
hotplug.c	ARM: highbank: Add cpu hotplug support	2011-10-31 14:14:04 +01:00
lluart.c	ARM: add Highbank core platform support	2011-10-31 14:14:00 +01:00
localtimer.c	ARM: highbank: add SMP support	2011-10-31 14:14:02 +01:00
platsmp.c	ARM: highbank: add SMP support	2011-10-31 14:14:02 +01:00
pm.c	ARM: highbank: add suspend support	2011-10-31 14:14:05 +01:00
sysregs.h	ARM: add Highbank core platform support	2011-10-31 14:14:00 +01:00
system.c	ARM: restart: highbank: use new restart hook	2012-01-05 12:57:12 +00:00