net/bluetooth/l2cap_core.c · a77f4b4acf5b77f038bc11d3ca9b3af6f0124015 · Kirill Smelkov / linux · GitLab

Find file Blame History Permalink

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless · 211c17aa
John W. Linville authored Jun 13, 2012
```
Conflicts:
	drivers/net/wireless/ath/ath9k/main.c
	net/bluetooth/hci_event.c
```
211c17aa

l2cap_core.c 130 KB