Merge branch 'dt2' of git://github.com/hzhuang1/linux into next/dt
authorOlof Johansson <olof@lixom.net>
Sat, 29 Sep 2012 18:43:51 +0000 (11:43 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 29 Sep 2012 18:43:51 +0000 (11:43 -0700)
From Haojian Zhuang:
* 'dt2' of git://github.com/hzhuang1/linux:
  ARM: dt: mmp-dma: add binding file


Trivial merge