Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[linux-2.6] / net / bridge / Kconfig
2005-07-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-07-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-07-12  Sam Ravnborg[NET]: move config options out to individual protocols