tree 8f60eb59c29b81dafdc60ad5e04e957fc8f3cdee
parent 58a14ee9c49aa2b9742c56a0477666335368e05e
parent 30ddb159ff3c632fdad3c0abc2e7d586a59bc5d1
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1202673837 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1202673837 -0800

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] ematch: Fix build warning.