From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 22 Aug 2007 18:13:00 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.23-rc4~92
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=13c926e04602db207366c7d213dd99d443ac4ad8;p=linux-2.6-omap-h63xx.git

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [IRDA] irda_nl_get_mode: always results in failure
  [PPP]: Fix output buffer size in ppp_decompress_frame().
  [IRDA]: Avoid a label defined but not used warning in irda_init()
  [IPV6]: Fix kernel panic while send SCTP data with IP fragments
  [SNAP]: Check packet length before reading
  [DCCP]: Allocation in atomic context
---

13c926e04602db207366c7d213dd99d443ac4ad8