From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 6 Dec 2010 20:35:34 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=f435d9eea01309aa7b6c1f134569a7b5957918ae;p=linux-edison.git

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

f435d9eea01309aa7b6c1f134569a7b5957918ae