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: archive/raspbian/4.9.13-1+rpi1~10^2~10882^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2e51fd3c13e330d9364a211ddcd3e38771eeb4b4;p=linux-4.9.git

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

2e51fd3c13e330d9364a211ddcd3e38771eeb4b4