Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 30 May 2012 14:32:16 +0000 (10:32 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 30 May 2012 14:32:16 +0000 (10:32 -0400)
commita0f68763e1c7dd57fa2dae3c07bc50651e2eac29
treef3a8fc40b3f0e6eb4a8579bb799c143a62f2c354
parent3fdcbd453152329002f12dfda0be90b714458164
parent7b21aea04d084916ac4e0e8852dcc9cd60ec0d1d
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem
drivers/net/wireless/brcm80211/brcmfmac/usb.c