]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Jul 2008 04:17:20 +0000 (21:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Jul 2008 04:17:20 +0000 (21:17 -0700)
commit310478b3c57edb43cc3309e4d57384c15deeaecf
tree140dec7fc0a8eaddc0f529e1790f888811de53a7
parent69679b1606c26d8993d3d6d6287f051c9438b6f5
parentaa7ae1ceefbd52f01ddceb5df5d725b5ab0b0347
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:
  pkt_sched: Fix build with NET_SCHED disabled.