Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 22 Aug 2007 18:13:00 +0000 (11:13 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 22 Aug 2007 18:13:00 +0000 (11:13 -0700)
commit13c926e04602db207366c7d213dd99d443ac4ad8
treed5d1f5acf648c5c58644eb28b42cb462d5ef7da1
parent53ce2dc2718c57346c543dab254fc900c6fe6c65
parent22117ea4fef4ea1c7d97c4d68c02c96c268a511b
Merge branch 'master' of /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