Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Sep 2008 14:45:06 +0000 (07:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Sep 2008 14:45:06 +0000 (07:45 -0700)
commit18f22fbb8ba5570a5ea3d531bc4ec65cf211f11b
treebe8665fca14508ebb88bd38bfa0ca9baece6f018
parent72d31053f62c4bc464c2783974926969614a8649
parentad55dcaff0e34269f86975ce2ea0da22e9eb74a1
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  netdev: simple_tx_hash shouldn't hash inside fragments