Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc
authorOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 23:04:15 +0000 (15:04 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 23:05:20 +0000 (15:05 -0800)
commita5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13
treecce7eab28de00a88d75b8eda704f5838e10947b1
parentdcf81c1af839b77b44404453ecae6e5ac5a75f05
parent62aa2b537c6f5957afd98e29f96897419ed5ebab
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
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-imx/mm-imx5.c
arch/arm/mach-realview/realview_eb.c
arch/arm/mach-realview/realview_pb11mp.c
arch/arm/mach-vexpress/ct-ca9x4.c