Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 12 Dec 2011 19:19:43 +0000 (14:19 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 12 Dec 2011 19:19:43 +0000 (14:19 -0500)
commitf2abba4921b945a6f8aca36fcba634c22797ba78
tree77b06167aba97c7400759547fffdb38805ff6bd6
parentdfd56b8b38fff3586f36232db58e1e9f7885a605
parentb6a27d1e6b8e163dee054c9cd03639c62756c2e2
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem