From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 6 Jul 2012 18:59:36 +0000 (+0200)
Subject: Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2... 
X-Git-Tag: master-2012-08-06~131^2~3
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=c16b4c1af326dae7d3ef251e4f13dea7c2051485;p=~andy%2Flinux

Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/fixes-non-critical

From Shawn Guo <shawn.guo@linaro.org>:

* 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs/tx28: fix odd include

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

c16b4c1af326dae7d3ef251e4f13dea7c2051485