From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 6 Oct 2010 20:25:52 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.37-rc1~147^2~191^2^2~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=373426cac0cbb7f762018127803dcd70838e2cdf;p=thirdparty%2Fkernel%2Flinux.git

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

373426cac0cbb7f762018127803dcd70838e2cdf