Merge branches 'cma' and 'ocrdma' into for-linus
authorRoland Dreier <roland@purestorage.com>
Sun, 24 Jun 2012 11:59:59 +0000 (04:59 -0700)
committerRoland Dreier <roland@purestorage.com>
Sun, 24 Jun 2012 11:59:59 +0000 (04:59 -0700)

Trivial merge