tree 140dec7fc0a8eaddc0f529e1790f888811de53a7
parent ae0645a451b02ad35c520b01177b70ebd59c91ab
parent 3a682fbd732d3d27bec722a923952b0938e8a404
author Linus Torvalds <torvalds@linux-foundation.org> 1216613840 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216613840 -0700

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.