From: Olof Johansson <olof@lixom.net>
Date: Wed, 21 Nov 2012 08:00:25 +0000 (-0800)
Subject: Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3f6f1cd6ffb473f426858692e8e1cb82aea137eb;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards

From Haojian Zhuang:
* 'armsoc/board' of git://github.com/hzhuang1/linux:
  ARM: mmp: select pinctrl driver
  + Linux 3.7-rc6
---

3f6f1cd6ffb473f426858692e8e1cb82aea137eb