Merge commit 'v2.6.31-rc1' into dmaengine
authorDan Williams <dan.j.williams@intel.com>
Tue, 8 Sep 2009 21:32:24 +0000 (14:32 -0700)
committerDan Williams <dan.j.williams@intel.com>
Tue, 8 Sep 2009 21:32:24 +0000 (14:32 -0700)

Trivial merge