Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
[pandora-kernel.git] / net / bluetooth / Kconfig
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2