Merge "apexq/expressatt: allow gpu app locking" into cm-10.2
Merge remote-tracking branch 'caf/jb_2.6' into cm-10.2
mmc: allow ext_csd revision 7

Newer d2 revisions are coming with version 7, this matches the stock
kernel too.

Change-Id: Ie64f681dc2dee0e52ba46dca55dfb310bf0eba93