-
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.gitJohan Hedberg authored
Conflicts: include/net/bluetooth/l2cap.h net/bluetooth/hci_conn.c net/bluetooth/l2cap_core.c
46479e69
Conflicts: include/net/bluetooth/l2cap.h net/bluetooth/hci_conn.c net/bluetooth/l2cap_core.c