Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
John W. Linville 12 years ago 6b732323 c0465559