Merge git://git.infradead.org/ubifs-2.6