diff options
author | Tony Lindgren <tony@atomide.com> | 2012-06-28 16:46:41 +0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-06-28 16:46:41 +0400 |
commit | 5f6129675bf17aeda5385830c446b91899cb6812 (patch) | |
tree | c5c84f654343c1e30d2a31f4a719e628da218e2d /arch/arm/plat-omap/include | |
parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff) | |
parent | b924b2047045844644e04b3c6e8308b2114afe7e (diff) | |
parent | bedfb7adc7f7e2f344b21584905b2357147ba27e (diff) | |
download | linux-5f6129675bf17aeda5385830c446b91899cb6812.tar.xz |
Merge branches 'cleanup-udc' and 'cleanup-dma' into cleanup