From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 19 Jul 2013 16:54:28 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: next-20130731~110^2~32^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=876fbb5d3ebab01685fef3839d245481c30eab5f;p=karo-tx-linux.git

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

876fbb5d3ebab01685fef3839d245481c30eab5f