Merge tag 'upstream-3.6-rc3' of git://git.infradead.org/linux-ubifs