]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 15 Jul 2011 14:05:24 +0000 (10:05 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 15 Jul 2011 14:05:24 +0000 (10:05 -0400)
commit9b46d414b74a07c7c4afd4b5683462e9e31cfeff
treec69d5cb97a4d97b6062a276ecdfa8582535193af
parent151405fa782db32503a9d1e47c8167cc3e5e925c
parente72bfc083d41739fa136ebfc037807ea0dde8021
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
net/bluetooth/l2cap_core.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/libertas/cmd.c
drivers/net/wireless/libertas/cmdresp.c
drivers/net/wireless/libertas/main.c
include/net/bluetooth/hci_core.h
net/bluetooth/hci_core.c