Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[safe/jmp/linux-2.6] / net / packet / Kconfig
2005-07-12 Sam Ravnborg[NET]: move config options out to individual protocols