Merge tag 'v3.15-rc6' into next/defconfig

Linux 3.15-rc6