From: Arnd Bergmann 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: firefly_0821_release~3680^2~2404^2~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c16b4c1af326dae7d3ef251e4f13dea7c2051485;p=firefly-linux-kernel-4.4.55.git 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 : * '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 --- c16b4c1af326dae7d3ef251e4f13dea7c2051485