Merge branch 'num_rx_queues' of git://kernel.ubuntu.com/rtg/net-2.6