Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Dec 2012 21:24:55 +0000 (16:24 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Dec 2012 21:24:55 +0000 (16:24 -0500)
commitf9c4d420c12de65e58a1a14ccee03e8b5cf99f5b
tree7cfaf7e15f29c30919b1d4527862ce914619cbe2
parent75be437230b06fca87908a787f70de0ce7fbab8c
parentc66cfd5325bb215a251f4685fac8718b1da33197
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem