Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[safe/jmp/linux-2.6] / net / x25 / Kconfig
2005-07-12 Sam Ravnborg[NET]: move config options out to individual protocols