Merge tag 'upstream-3.7-rc6' of git://git.infradead.org/linux-ubifs