Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
authorMarcel Holtmann <marcel@holtmann.org>
Thu, 3 Jul 2014 14:39:39 +0000 (16:39 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 3 Jul 2014 14:39:39 +0000 (16:39 +0200)
commit53730107b223e31f5d2fe2648f58a4ef90ad6f12
tree743d836fe7a0496558c9fbaa218e4ab944fb11cd
parent15be8e89cdd999124a2307ffd6dacb895c3b802e
parent48439d501e3d9e8634bdc0c418e066870039599d
Merge git://git./linux/kernel/git/bluetooth/bluetooth
drivers/net/wireless/b43/Kconfig
drivers/net/wireless/b43/main.c
drivers/net/wireless/mwifiex/pcie.c
drivers/net/wireless/mwifiex/util.h
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00mac.c