Merge tag 'v3.6-rc4' into asoc-omap

Linux 3.6-rc4