From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 9 Jun 2011 18:23:30 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.0-rc3~13^2~15
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e23535ca11525945bd7fca05ac5941efba232498;p=users%2Fjedix%2Flinux-maple.git

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

e23535ca11525945bd7fca05ac5941efba232498