Merge tag 'v3.4-rc6' into spi/next

Linux 3.4-rc6