Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

diff --cc drivers/net/wireless/b43/Kconfig
Simple merge

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

diff --cc drivers/net/wireless/mwifiex/pcie.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/util.h
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00dev.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00mac.c
Simple merge