tree 88ff63fb1c462021992f196fefec5ea459291d9c
parent 2249b011432ca3dcce112f0f71e0f531b4bb9347
parent f78b68261e80899f81a21dfdf91e2a1456ea8175
author John W. Linville <linville@tuxdriver.com> 1316458049 -0400
committer John W. Linville <linville@tuxdriver.com> 1316458049 -0400

Merge branch 'for-3.1' of git://github.com/padovan/bluetooth-next