From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 22 Jul 2011 21:51:16 +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=41bf37117b47fc5ce2aae91f6a108e7e42e0b046;p=deliverable%2Flinux.git

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

41bf37117b47fc5ce2aae91f6a108e7e42e0b046