| commit | 312fef7d18adda2be822d31916547f84ed6af28b | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Nov 09 14:54:33 2011 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Nov 09 14:54:33 2011 -0500 |
| tree | 095d936b751b0a92946fcf710fb74dea7f8f33f7 | |
| parent | 5e819059a20b0fc5a71875f28b4cae359e38d85a [diff] | |
| parent | 2aeabcbedd51aef94b61d05b57246d1db4984453 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next Conflicts: net/bluetooth/l2cap_sock.c net/bluetooth/mgmt.c