Merge tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubi