tree 16abc0c02b45126e6064d6d9d71dc0cf9a870c72
parent 619baba195d92ec39379e24c151f4a640898d140
parent 08c801f8d45387a1b46066aad1789a9bb9c4b645
author David S. Miller <davem@davemloft.net> 1276126105 -0700
committer David S. Miller <davem@davemloft.net> 1276126105 -0700

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