Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Sep 2012 15:39:39 +0000 (11:39 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Sep 2012 15:39:39 +0000 (11:39 -0400)
commit7a253c2954dad9d70fa2e07b45b55ea4bee6c6c7
tree3ab1ff21ef1db5dc3f0d5a5a9f198ac39bd71b78
parent6af773e786ad617b0264ebe06ba60675c01f3e51
parente020a83d0942a5aceac35986500c9834efc8707d
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem