Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 2 Jun 2014 15:20:17 +0000 (11:20 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 2 Jun 2014 15:20:17 +0000 (11:20 -0400)
commitfcb2c0d6cf75750e2912b09a3d0a782c90e2b1a0
treea17982638b066ae29f8ab1a6e37f18e6dddb5272
parent96b2e73c5471542cb9c622c4360716684f8797ed
parenta715c7ddd65a1a3b2839b8ebd759bb2d361f7675
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem