Merge of /spare/repo/netdev-2.6 branch misc-fixes