From: Sascha Hauer Date: Mon, 31 Jan 2011 11:42:51 +0000 (+0100) Subject: Merge branch 'dmaengine-shawn' into dmaengine X-Git-Tag: v2.6.38-rc5~7^2~1^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=60f1df5dc6ecd07befc332ae30109fb86505634c;p=users%2Fjedix%2Flinux-maple.git Merge branch 'dmaengine-shawn' into dmaengine --- 60f1df5dc6ecd07befc332ae30109fb86505634c