From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Thu, 8 Dec 2011 23:00:27 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e5cd9ec191e8190c3b8c55f0e0c27b7e1da040e6;p=openwrt%2Fstaging%2Fblogic.git

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

e5cd9ec191e8190c3b8c55f0e0c27b7e1da040e6