tree 8fc6069c00b156519c78fc3644a7eed4105a7bab
parent 4d11eff66889e65e9351111b1cc39f066f9f9729
parent 52ea3a56a3268bc2a5a7c75e98c81463004e38ef
author Linus Torvalds <torvalds@linux-foundation.org> 1244562447 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1244562447 -0700

Merge git://git.kernel.org/pub/scm/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