am 46820412: am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t...
am 46820412: am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW usage bits" into gingerbread
Merge commit '46820412'
* commit '46820412':
don't try to lock a buffer that wasn't allocated with SW usage bits