From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 8 Jul 2011 15:01:31 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8a98d935c4b8b3515d1403d150e282f95b9f558d;p=openwrt%2Fstaging%2Fblogic.git

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

8a98d935c4b8b3515d1403d150e282f95b9f558d