Merge tag 'jfs-3.12' of git://github.com/kleikamp/linux-shaggy