From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 6 Dec 2011 14:23:35 +0000 (+0000)
Subject: Merge branch 'mxs/saif' into next/drivers
X-Git-Tag: v3.3-rc1~138^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3642a0a2c7d2d1949988d0fd004a8039c1f3d02f;p=pandora-kernel.git

Merge branch 'mxs/saif' into next/drivers

Conflicts:
	drivers/net/ethernet/cadence/Kconfig
---

3642a0a2c7d2d1949988d0fd004a8039c1f3d02f
Reading git-diff-tree failed