]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 Apr 2010 23:28:56 +0000 (16:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 Apr 2010 23:28:56 +0000 (16:28 -0700)
commit32fcf5e675bc1a6749f7c1059e5b75ce80e87527
tree777a0e110de0d378c9425684369bef9cbab20649
parent70dda3cfe165e51ce8f22c45d315794b1be40d34
parentb41cd8a6cd1d6cb96488579dfa91af5cefdf09d5
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