tree 6032c96747aeae7544be71e4f3b7e2866a21bb1c
parent 6e08d757b72f280c45cfec61e63216adb419e2dd
parent e825eb1d7e06f616003c17e2e8e421c2e5e44142
author John W. Linville <linville@tuxdriver.com> 1389206669 -0500
committer John W. Linville <linville@tuxdriver.com> 1389206669 -0500

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