Merge tag 'v4.6-rc5' into spi-rockchip

Linux 4.6-rc5