From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 5 Dec 2011 16:05:44 +0000 (-0500)
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=cbec0627ef1adf7afa448e8bbae3146ce910212a;p=openwrt%2Fstaging%2Fblogic.git

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

cbec0627ef1adf7afa448e8bbae3146ce910212a