From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 Apr 2010 23:28:56 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.34-rc6~30
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=b91ce4d14a21fc04d165be30319541e0f9204f15

Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  ipv6: Fix inet6_csk_bind_conflict()
  e100: Fix the TX workqueue race
---

b91ce4d14a21fc04d165be30319541e0f9204f15