From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 26 Jul 2011 21:05:55 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.1-rc1~130^2~19^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5036c2575b244851637a81efc4104c076c4fa21;p=pandora-kernel.git

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

e5036c2575b244851637a81efc4104c076c4fa21