Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

Conflicts:
	net/bluetooth/l2cap_core.c

diff --cc drivers/net/wireless/ath/ath5k/base.c
Simple merge

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-dev.h
Simple merge

diff --cc drivers/net/wireless/libertas/cmd.c
Simple merge

diff --cc drivers/net/wireless/libertas/cmdresp.c
Simple merge

diff --cc drivers/net/wireless/libertas/main.c
Simple merge

diff --cc include/net/bluetooth/hci_core.h
Simple merge

diff --cc net/bluetooth/hci_core.c
Simple merge