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

This commit is contained in:
John W. Linville 2013-03-13 13:29:56 -04:00
commit d15591b008
2 changed files with 6 additions and 0 deletions