tree 3884c2a49862eb3d192629d13aed065deaa014f1
parent 083f1717d6122feebb85bc17d2958751b24c2910
parent e71dc5f787f3908b8b8158103fc7d74a78a22cd1
author Arnd Bergmann <arnd@arndb.de> 1363342735 +0100
committer Arnd Bergmann <arnd@arndb.de> 1363342735 +0100

Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into fixes

From Haojian Zhuang <haojian.zhuang@gmail.com>:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
  ARM: mmp: add platform_device head file in gplugd

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