projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 083f171 e71dc5f)
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)
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>

Trivial merge
John Crispins staging tree