From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 2 Sep 2010 17:30:07 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.37-rc1~147^2~584^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=78ab952717b62c0ba6ca7f7a27eaa0486685e45f;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
---

78ab952717b62c0ba6ca7f7a27eaa0486685e45f