Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Jan 2013 20:22:52 +0000 (15:22 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Jan 2013 20:22:52 +0000 (15:22 -0500)
commit7b87e573413c3d6a006f572fb4d2105ff5d97fda
treee8eb1fbc2fabcf2113c0876e86f3f6c029cdf54d
parentfdb184d1467f9ed5b17c553b85eb1bb72bdbf62f
parent9a6f7347f59f55433ec50578e8d42d305e0d53ae
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem