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)
* 'board' of git://github.com/hzhuang1/linux:
  ARM: mmp: enable debug uart port in defconfig
  ARM: mmp: implement DEBUG_LL port choice


Trivial merge