From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 30 Jun 2011 15:26:04 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=690b0cacb6dbbbcb06b76139ab65e1bf3f63e7f1;p=deliverable%2Flinux.git

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

690b0cacb6dbbbcb06b76139ab65e1bf3f63e7f1