tree 3aada0b8d12cb8d67c88fa39c4ad71ac7b2cef27
parent 6942fec92d3d1b6918425730de31b4c6d0d5c196
parent d9319560b86839506c2011346b1f2e61438a3c73
author John W. Linville <linville@tuxdriver.com> 1292269283 -0500
committer John W. Linville <linville@tuxdriver.com> 1292269283 -0500

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6