Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 24 Jan 2014 18:25:15 +0000 (13:25 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 24 Jan 2014 18:25:15 +0000 (13:25 -0500)
commit5746cc2a6923b4e4726d9be8aa155461829be360
tree78568cd9732fbb70b1206fcaeb6f90220752ef9f
parentf55aa836fb7a90b62cb2c533b899e331cdffcf0c
parenta64e1a45060f41423c89768f4f7bef3283678539
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem