]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 May 2012 17:10:59 +0000 (10:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 May 2012 17:10:59 +0000 (10:10 -0700)
commita2ae9787568ac50978c03ce67bfb79ad2e100cca
tree2148bceaa586c61a59528f8265882860fa055cfa
parent62ade86ab6c7e26409229ca45503cae97bf698cf
parentd4b1133558e0d417342d5d2c49e4c35b428ff20d
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull one more networking bug-fix from David Miller:
 "One last straggler.

  Eric Dumazet's pktgen unload oops fix was not entirely complete, but
  all the cases should be handled properly now....  fingers crossed."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  pktgen: fix module unload for good