Skip to content
GitLab
Explore
Sign in
Register
xcap
xcap-capability-linux
Repository
xcap-capability-linux
include
net
bluetooth
l2cap.h
Find file
Blame
History
Permalink
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
· 312fef7d
John W. Linville
authored
Nov 09, 2011
Conflicts: net/bluetooth/l2cap_sock.c net/bluetooth/mgmt.c
312fef7d