From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 20 Sep 2011 13:19:14 +0000 (-0400)
Subject: Merge branch 'master' of ssh://infradead/~/public_git/wireless into for-davem
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=eebb6fb4ae2f60a82e38afb6d8b373a4216bf891;p=linux.git

Merge branch 'master' of ssh://infradead/~/public_git/wireless into for-davem
---

eebb6fb4ae2f60a82e38afb6d8b373a4216bf891