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)
commitebedb22d2bacdcf577348eae77ab8f27c9db8ee8
tree16abc0c02b45126e6064d6d9d71dc0cf9a870c72
parent619baba195d92ec39379e24c151f4a640898d140
parent08c801f8d45387a1b46066aad1789a9bb9c4b645
Merge branch 'num_rx_queues' of git://kernel.ubuntu.com/rtg/net-2.6