tree be8665fca14508ebb88bd38bfa0ca9baece6f018
parent 72d31053f62c4bc464c2783974926969614a8649
parent ad55dcaff0e34269f86975ce2ea0da22e9eb74a1
author Linus Torvalds <torvalds@linux-foundation.org> 1222094706 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1222094706 -0700

Merge git://git.kernel.org/pub/scm/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