lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
e8729dda3f
linux-kernel-test/arch/arm/mach-realview
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
core.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
core.h ARM: amba: realview: get rid of private platform amba_device initializer 2012-01-26 19:59:18 +00:00
hotplug.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
Kconfig ARM: SMP: Refactor Kconfig to be more maintainable 2011-12-19 13:47:39 +00:00
Makefile ARM: realview/vexpress: consolidate SMP bringup code 2011-02-19 11:11:41 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
platsmp.c ARM: versatile: Add missing ENDPROC to headsmp.S 2012-01-16 08:35:25 -06:00
realview_eb.c Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
realview_pb11mp.c Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
realview_pb1176.c ARM: amba: realview: get rid of private platform amba_device initializer 2012-01-26 19:59:18 +00:00
realview_pba8.c ARM: amba: realview: get rid of private platform amba_device initializer 2012-01-26 19:59:18 +00:00
realview_pbx.c ARM: amba: realview: get rid of private platform amba_device initializer 2012-01-26 19:59:18 +00:00