Skip to content
GitLab
Commit 312fef7d authored by John W. Linville's avatar John W. Linville
Browse files

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
parents 5e819059 2aeabcbe
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment