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)
1  2 
drivers/dma/edma.c

Simple merge