From: Roland Dreier <roland@purestorage.com>
Date: Sun, 24 Jun 2012 11:59:59 +0000 (-0700)
Subject: Merge branches 'cma' and 'ocrdma' into for-linus
X-Git-Tag: v3.5-rc4~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e51fd3c13e330d9364a211ddcd3e38771eeb4b4;p=pandora-kernel.git

Merge branches 'cma' and 'ocrdma' into for-linus
---

2e51fd3c13e330d9364a211ddcd3e38771eeb4b4
Reading git-diff-tree failed