From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 15 Mar 2013 10:18:55 +0000 (+0100)
Subject: Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into fixes
X-Git-Tag: v3.12-rc1~1208^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04cf1440c0fbb320ddea00ef878c7b53c7b7298c;p=kernel%2Fkernel-generic.git

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>
---

04cf1440c0fbb320ddea00ef878c7b53c7b7298c