From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 29 Jul 2010 18:47:07 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ae3568adf42d5d3bb3cfa505b94351c5d1ce4924;p=linux-beck.git

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

ae3568adf42d5d3bb3cfa505b94351c5d1ce4924