Merge branch 'dt2' of git://github.com/hzhuang1/linux into next/dt

From Haojian Zhuang:
* 'dt2' of git://github.com/hzhuang1/linux:
  ARM: dt: mmp-dma: add binding file
This commit is contained in:
Olof Johansson 2012-09-29 11:43:51 -07:00
commit 4b1ebb64ab