net/bluetooth/hci_event.c · b3c911eeb47d08aada986f769b6a060794dfe9d0 · nexedi / 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

hci_event.c 84.6 KB