From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Wed, 15 May 2013 15:19:21 +0000 (+0200)
Subject: ARM: at91: udpate defconfigs
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~72^2~20^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3f442b0eedbc20b5ce3f4a96530588d14901199;p=pandora-kernel.git

ARM: at91: udpate defconfigs

Merge 9g20 with 9260 and 9g10 with 9261 as those SoCs can run from the same
kernel even in non DT world.

Fix the sam9261ek to allow 9g10 and sam9261 to compile together.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---

Reading git-diff-tree failed