tree c1c85a625cff3f2ca6d95a5d5020a0157baa7521
parent 56e1bd770614da94f35e88c150cf9edf8d0b57a2
parent 9b008c0457e583e10e62d1215bed6ab26ee54906
author John W. Linville <linville@tuxdriver.com> 1359573664 -0500
committer John W. Linville <linville@tuxdriver.com> 1359573664 -0500

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