Merge git://github.com/rustyrussell/linux