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)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  netdev: simple_tx_hash shouldn't hash inside fragments


Trivial merge