Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
commitfd4d34295b36c5d9a1aba3d3f2764d721db093be
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jun 2009 15:47:27 +0000 (9 08:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jun 2009 15:47:27 +0000 (9 08:47 -0700)
tree8fc6069c00b156519c78fc3644a7eed4105a7bab
parent4d11eff66889e65e9351111b1cc39f066f9f9729
parent52ea3a56a3268bc2a5a7c75e98c81463004e38ef
Merge git://git./linux/kernel/git/davem/net-2.6

* 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