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: MMI-PSA29.97-13-9~20995^2~12
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0a4bbddde29c038f2c51a7abb03d6d07e679d8af;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

0a4bbddde29c038f2c51a7abb03d6d07e679d8af