From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 24 Nov 2010 21:19:24 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.38-rc1~476^2~405^2^2~29
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d7a066c92394f3e777351de0c903beeb8a08af76;p=users%2Fjedix%2Flinux-maple.git

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

d7a066c92394f3e777351de0c903beeb8a08af76