From: Linus Torvalds Date: Sat, 19 May 2012 17:10:59 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net X-Git-Url: http://git.alex.org.uk Merge git://git./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 --- a2ae9787568ac50978c03ce67bfb79ad2e100cca