Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 19 Dec 2012 18:00:00 +0000 (13:00 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 19 Dec 2012 18:00:00 +0000 (13:00 -0500)
commitd67df2b9edfc42ccc0a9ee5332e2821d487d6b3b
treea6e40732cfeecebca79a76ef2bb28c428ba1ec18
parentc1e37ea287979052e3eab441e58da3899a8e2389
parent009b969632137f91534db91c19d62f1ae21ba8a0
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem