From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 12 Apr 2012 17:49:28 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8065248069097dddf9945acfb2081025e9618c16;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
---

8065248069097dddf9945acfb2081025e9618c16