Merge branch 'board' of git://github.com/hzhuang1/linux into next/boards
authorOlof Johansson <olof@lixom.net>
Thu, 13 Sep 2012 05:37:04 +0000 (22:37 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 13 Sep 2012 05:37:04 +0000 (22:37 -0700)
commit3b164b7b5260b8006a5dee00554d69ad0d79743f
tree05181b34d3cebbd6886dd76ba5d97adc10947ee7
parentf46e374c1ea7fafce70a838f09fbd67de3e4d49f
parentec9b22eebbcf6ff1dfc121ec1e76bbb98a0418b4
Merge branch 'board' of git://github.com/hzhuang1/linux into next/boards

* 'board' of git://github.com/hzhuang1/linux:
  ARM: mmp: enable debug uart port in defconfig
  ARM: mmp: implement DEBUG_LL port choice