From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Aug 2008 19:14:42 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.27-rc5~42
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6450f65168bcf3c03b5fb44c2fe96682c0d3086b;p=linux-2.6-omap-h63xx.git

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:
  ipv6: protocol for address routes
  icmp: icmp_sk() should not use smp_processor_id() in preemptible code
  pkt_sched: Fix qdisc list locking
  pkt_sched: Fix qdisc_watchdog() vs. dev_deactivate() race
  sctp: fix potential panics in the SCTP-AUTH API.
---

6450f65168bcf3c03b5fb44c2fe96682c0d3086b