Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 23 Apr 2007 18:13:00 +0000 (11:13 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 23 Apr 2007 18:13:00 +0000 (11:13 -0700)
commit36e82dfda526e2dea26060e8766bda5a8110c4e6
tree9a6e300dadc47356bbed60ccd3dc7df72235b391
parent0f851021c0f91e5073fa89f26b5ac68e23df8e11
parent7c5050e3e49f6d89af0d63111611693d9625d1f5
Merge /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()