Merge branch 'imx' into dmaengine-fixes
authorDan Williams <dan.j.williams@intel.com>
Mon, 14 Feb 2011 10:40:46 +0000 (02:40 -0800)
committerDan Williams <dan.j.williams@intel.com>
Mon, 14 Feb 2011 10:40:46 +0000 (02:40 -0800)

Trivial merge