Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into fixes
authorArnd Bergmann <[email protected]>
Fri, 15 Mar 2013 10:18:55 +0000 (11:18 +0100)
committerArnd Bergmann <[email protected]>
Fri, 15 Mar 2013 10:18:55 +0000 (11:18 +0100)
From Haojian Zhuang <[email protected]>:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
  ARM: mmp: add platform_device head file in gplugd

Signed-off-by: Arnd Bergmann <[email protected]>

Trivial merge