Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

This commit is contained in:
John W. Linville 2013-04-26 08:36:00 -04:00
commit 375e875c69
7 changed files with 462 additions and 280 deletions