]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitaf34182d5e3890ef52054f2a4052256c36cb6b39
treecce7eab28de00a88d75b8eda704f5838e10947b1
parent5c4f9418d44bb5dea9aa3f015ada895716303915
parent3d8b8a7aacc0c84869c630451b22d84795dcb30a
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