tree ff7045c38e56624fd886837620a54daf54b6ba2a
parent 9330969b8fd1304fdcb7c1825f1528eea38d321c
parent 1d0c4da8f717937aeda47a72bc769d80f8776795
author John W. Linville <linville@tuxdriver.com> 1339614727 -0400
committer John W. Linville <linville@tuxdriver.com> 1339614727 -0400

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