summaryrefslogtreecommitdiff
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-06-28 05:46:41 -0700
committerTony Lindgren <tony@atomide.com>2012-06-28 05:46:41 -0700
commit5f6129675bf17aeda5385830c446b91899cb6812 (patch)
treec5c84f654343c1e30d2a31f4a719e628da218e2d /arch/arm/plat-omap
parent6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff)
parentb924b2047045844644e04b3c6e8308b2114afe7e (diff)
parentbedfb7adc7f7e2f344b21584905b2357147ba27e (diff)
Merge branches 'cleanup-udc' and 'cleanup-dma' into cleanup