From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Fri, 3 Feb 2012 11:32:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base
X-Git-Tag: v3.4-rc1~91^2~14^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57225b76864210d667b935c54babf22b6c31336b;p=pandora-kernel.git

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
---

57225b76864210d667b935c54babf22b6c31336b
Reading git-diff-tree failed