]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
Merge branch 'master-usb-dmazone' into master-of-sadanand-dma
authorJohn Linn <john.linn@xilinx.com>
Thu, 16 Jun 2011 21:20:43 +0000 (15:20 -0600)
committerJohn Linn <john.linn@xilinx.com>
Thu, 16 Jun 2011 21:20:43 +0000 (15:20 -0600)

Trivial merge