Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs