From: Dan Williams <dan.j.williams@intel.com>
Date: Wed, 8 Dec 2010 01:10:52 +0000 (-0800)
Subject: Merge branches 'fsldma' and 'intel-mid' into dmaengine
X-Git-Tag: firefly_0821_release~7613^2~2671^2~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0a4bbddde29c038f2c51a7abb03d6d07e679d8af;p=firefly-linux-kernel-4.4.55.git

Merge branches 'fsldma' and 'intel-mid' into dmaengine
---

0a4bbddde29c038f2c51a7abb03d6d07e679d8af