From: Dan Williams <dan.j.williams@intel.com>
Date: Thu, 1 Jul 2010 09:29:19 +0000 (-0700)
Subject: Merge branch 'timb' into dmaengine
X-Git-Tag: v2.6.36-rc1~311^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=084a2ab9c258fb1efbb009f1bb1c6976da1f73f4;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'timb' into dmaengine
---

084a2ab9c258fb1efbb009f1bb1c6976da1f73f4