From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 6 Mar 2013 15:21:17 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: next-20130312~94^2~3^2
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=32cdd592b723fc88ecca699e550197cd48bb4ad6;p=karo-tx-linux.git

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

32cdd592b723fc88ecca699e550197cd48bb4ad6