From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 23 Apr 2007 18:13:00 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.21~35
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=36e82dfda526e2dea26060e8766bda5a8110c4e6;p=linux.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [PPP]: Fix skbuff.c:BUG due incorrect logic in process_input_packet()
---

36e82dfda526e2dea26060e8766bda5a8110c4e6