From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 20 May 2013 19:19:01 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: MMI-PSA29.97-13-9~14343^2~18^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ba7c96bec59d1c11cf9eaf6489e70e22f53da31b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

ba7c96bec59d1c11cf9eaf6489e70e22f53da31b