From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 5 Dec 2013 14:29:56 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: next-20131210~54^2~7^2
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=aa489f0f268595bd33d9649030bd1a43c28927a0

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

aa489f0f268595bd33d9649030bd1a43c28927a0