From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 22 Nov 2011 21:46:55 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: MMI-PSA29.97-13-9~17939^2~46
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=02f1ce35bed3ceb56868ec534591e15ffdcef879;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

02f1ce35bed3ceb56868ec534591e15ffdcef879