Merge tag 'v3.18-rc2' into asoc-sgtl5000

Linux 3.18-rc2