git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a06347d f1cefa8)
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)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.