tree 514964b1d090f424435c167f2781eac8e6c6374a
parent 31c5770b5d7354c308bd41bf2bb3e02e5e0e95b6
parent 0227c7b56959cd8f5edd20b6a47db86fa553e91a
author John W. Linville <linville@tuxdriver.com> 1364243946 -0400
committer John W. Linville <linville@tuxdriver.com> 1364243946 -0400

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