]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jun 2009 15:47:27 +0000 (08:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jun 2009 15:47:27 +0000 (08:47 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  cls_cgroup: Fix oops when user send improperly 'tc filter add' request
  r8169: fix crash when large packets are received


Trivial merge