From: Roland Dreier <rolandd@cisco.com>
Date: Tue, 2 Mar 2010 07:51:54 +0000 (-0800)
Subject: Merge branch 'cma' into for-next
X-Git-Tag: v2.6.34-rc1~225^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8094e667aa89a7c455da1da9daf8a5ed063da8d;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'cma' into for-next
---

e8094e667aa89a7c455da1da9daf8a5ed063da8d