tree e6a0ce2254e1f026ab347c323d4b32f91747ee8e
parent de121989c8b5d946144354fce070f77e698e2cff
parent 94a32d10f47b637ae24b78b1ddc7ef0e8396fda4
author John W. Linville <linville@tuxdriver.com> 1363195796 -0400
committer John W. Linville <linville@tuxdriver.com> 1363195796 -0400

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