Merge branch 'num_rx_queues' of git://kernel.ubuntu.com/rtg/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 9 Jun 2010 23:28:25 +0000 (16:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Jun 2010 23:28:25 +0000 (16:28 -0700)

Trivial merge