Merge branch 'coh' into dmaengine
authorDan Williams <dan.j.williams@intel.com>
Thu, 4 Mar 2010 04:22:21 +0000 (21:22 -0700)
committerDan Williams <dan.j.williams@intel.com>
Thu, 4 Mar 2010 04:22:21 +0000 (21:22 -0700)

Trivial merge