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

This commit is contained in:
John W. Linville 2012-08-10 14:41:38 -04:00
commit bbf2e65258
7 changed files with 41 additions and 18 deletions