From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 13 Jul 2010 19:31:51 +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=815868e7b5c207ba42d5b317ccc51f8112732268;p=openwrt%2Fstaging%2Fblogic.git

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

815868e7b5c207ba42d5b317ccc51f8112732268