Merge tag 'v3.7-rc4'

Merge Linux 3.7-rc4 to get fixes for CMA.