From: Dan Williams <dan.j.williams@intel.com>
Date: Fri, 7 Jan 2011 20:47:05 +0000 (-0800)
Subject: Merge branches 'amba' and 'dma40' into dmaengine
X-Git-Tag: v2.6.38-rc1~25^2~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bc0fa81473c077bf4403e3b7b3397326204b65cd;p=users%2Fjedix%2Flinux-maple.git

Merge branches 'amba' and 'dma40' into dmaengine
---

bc0fa81473c077bf4403e3b7b3397326204b65cd