]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 13 Jun 2012 19:35:35 +0000 (15:35 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 13 Jun 2012 19:35:35 +0000 (15:35 -0400)
commit6724d01d7a24d0dd067dcc1784483691a1842357
tree2acf7fe32b30f537b06fed7e4c536ef0d11f2902
parent1bb46962af1af2a85ae817b8aca25cd709f52ffe
parent279a60a3e9c9e3c455a5c51fa9362fb6666cdd71
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
drivers/net/wireless/ath/ath9k/main.c
net/bluetooth/hci_event.c
drivers/net/wireless/ath/ath9k/main.c
include/net/bluetooth/hci.h
include/net/mac80211.h
net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c
net/mac80211/cfg.c
net/mac80211/mlme.c