Merge branch 'timb' into dmaengine
authorDan Williams <dan.j.williams@intel.com>
Thu, 1 Jul 2010 09:29:19 +0000 (02:29 -0700)
committerDan Williams <dan.j.williams@intel.com>
Thu, 1 Jul 2010 09:29:19 +0000 (02:29 -0700)

Trivial merge