Automatic merge of /spare/repo/netdev-2.6 branch use-after-unmap