From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Jun 2009 15:47:27 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.0~9075
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd4d34295b36c5d9a1aba3d3f2764d721db093be;p=platform%2Fkernel%2Flinux-amlogic.git

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
---

fd4d34295b36c5d9a1aba3d3f2764d721db093be