Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Nov 2012 17:59:13 +0000 (12:59 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Nov 2012 17:59:13 +0000 (12:59 -0500)
commit26c6e80892d8c160dffaba85889bd4e65b1dacf6
tree0d7751d80ac44b9407270be246f83e8354fc26ba
parent6fc4adca6ce3e1d57a42707019dddcb883578a91
parentd61f978b8f26d2392c88249f877e46e2c2b5561d
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem