tree 777a0e110de0d378c9425684369bef9cbab20649
parent 202f2bb0708e968099a23fead4598a4c3f8f8637
parent 6443bb1fc2050ca2b6585a3fa77f7833b55329ed
author Linus Torvalds <torvalds@linux-foundation.org> 1272238136 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1272238136 -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:
  ipv6: Fix inet6_csk_bind_conflict()
  e100: Fix the TX workqueue race