Merge tag 'v3.11-rc5' into asoc-dapm

Linux 3.11-rc5