Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2...
authorArnd Bergmann <arnd@arndb.de>
Fri, 6 Jul 2012 18:59:36 +0000 (20:59 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 6 Jul 2012 18:59:36 +0000 (20:59 +0200)
commitc16b4c1af326dae7d3ef251e4f13dea7c2051485
tree70e2415cbe23f5764345bc4dee0e59328ecd2f3a
parenta06347d0cac281546954c4223073ecd9bbf719c5
parentf1cefa855f6e7d10dd49724ede771b8f0c2a90e7
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>