Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 21 Nov 2013 15:26:17 +0000 (10:26 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 21 Nov 2013 15:26:17 +0000 (10:26 -0500)
commit7acd71879ce408af2d2ca3cd3ec3a86d0667ceae
tree8332fdffc7980575268f902c1cffe37ee2587a4d
parent68c6beb373955da0886d8f4f5995b3922ceda4be
parent3b1bace9960b0acbcb5d0ca194077f03df7cc2c0
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem
drivers/net/wireless/brcm80211/brcmfmac/p2p.c
net/bluetooth/rfcomm/sock.c