]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7a8fc9b f410a1f)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Aug 2008 19:14:42 +0000 (12:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Aug 2008 19:14:42 +0000 (12:14 -0700)
commit6450f65168bcf3c03b5fb44c2fe96682c0d3086b
treec6d2c3e0885ef3f73893c7e6d22ea9454d073ee6tree
parent7a8fc9b248e77a4eab0613acf30a6811799786b3commit | diff
parentf410a1fba7afa79d2992620e874a343fdba28332commit | diff
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.
Ubuntu Disco kernel mirror for Proxmox VE and PMG