tree 31a1e54475c3c9da63326efd7f63871004a1a249
parent b006ed545cbadf1ebd4683719554742d20dbcede
parent 69676b1c2af451bfe5cd36ff4973a484b5d5a86c
author John W. Linville <linville@tuxdriver.com> 1366979760 -0400
committer John W. Linville <linville@tuxdriver.com> 1366979760 -0400

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