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)
commit95a943c162d74b20d869917bdf5df11293c35b63
treec69d5cb97a4d97b6062a276ecdfa8582535193af
parentecae42d37045ec71831d0e0e493e00b0e0732edd
parent95acac61ba66c4abd40e038dae8c1ed2e176c7b1
Merge branch 'master' of git://git./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