Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 9 Jan 2014 15:19:01 +0000 (10:19 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 9 Jan 2014 15:19:01 +0000 (10:19 -0500)
commit0f74d82d80e653545f4190c96a25f3b6751a8370
tree926f63567dd9f27e053cc2d3c36eacc908bdbfef
parent732256b9335f8456623bb772d86c2a24e3cafca2
parent2eff7c791a18a31a6ede36172258c4e05d632fac
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem