Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards
authorOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 08:00:25 +0000 (00:00 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 08:00:25 +0000 (00:00 -0800)
From Haojian Zhuang:
* 'armsoc/board' of git://github.com/hzhuang1/linux:
  ARM: mmp: select pinctrl driver
  + Linux 3.7-rc6


Trivial merge