Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 10 Feb 2008 20:03:57 +0000 (12:03 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 10 Feb 2008 20:03:57 +0000 (12:03 -0800)
commit7cf712db6087342e5e7e259d3883a7b5ac3212d1
tree8f60eb59c29b81dafdc60ad5e04e957fc8f3cdee
parent58a14ee9c49aa2b9742c56a0477666335368e05e
parent30ddb159ff3c632fdad3c0abc2e7d586a59bc5d1
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  [PKT_SCHED] ematch: Fix build warning.