Merge branch 'ep93xx-dma' into spi/next
commite4c8308c852e6b3fa49215052a5b9e99597dee99
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 9 Jun 2011 18:42:57 +0000 (9 12:42 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 9 Jun 2011 18:42:57 +0000 (9 12:42 -0600)
treea44ef3377c17d69c2210e809ac2552540ce6f1fc
parentc37f3c2749b53225d36faa5c583203c5f12ae15b
parent626a96db11698119a67eeda130488e869aa6f14e
Merge branch 'ep93xx-dma' into spi/next
drivers/spi/spi-ep93xx.c