Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base
authorNicolas Ferre <nicolas.ferre@atmel.com>
Fri, 3 Feb 2012 11:32:26 +0000 (12:32 +0100)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Fri, 3 Feb 2012 11:32:26 +0000 (12:32 +0100)
commit57225b76864210d667b935c54babf22b6c31336b
treecce7eab28de00a88d75b8eda704f5838e10947b1
parent62aa2b537c6f5957afd98e29f96897419ed5ebab
parentdcf81c1af839b77b44404453ecae6e5ac5a75f05
Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base

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