Merge commit 'ae0add740cd06169cd124f9aaa6eceb11e5b3060' into omap-for-v4.5/dt
authorTony Lindgren <tony@atomide.com>
Thu, 17 Dec 2015 17:41:18 +0000 (09:41 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 17 Dec 2015 17:41:18 +0000 (09:41 -0800)
commit1f9230fbf37f6a89f90ab955b8d1a1d0958668bf
tree49efd203ccfcee8623018b21b4e27a4750773379
parent89c6f2e5ab7a0499c6bcb25d281977ada205765d
parentae0add740cd06169cd124f9aaa6eceb11e5b3060
Merge commit 'ae0add740cd06169cd124f9aaa6eceb11e5b3060' into omap-for-v4.5/dt
drivers/dma/edma.c