linux/3.3: merge recent ubifs patches from 3.2