Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into fixes
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 10:18:55 +0000 (11:18 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 10:18:55 +0000 (11:18 +0100)
commit04cf1440c0fbb320ddea00ef878c7b53c7b7298c
tree3884c2a49862eb3d192629d13aed065deaa014f1
parent083f1717d6122feebb85bc17d2958751b24c2910
parente71dc5f787f3908b8b8158103fc7d74a78a22cd1
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>