From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 15 Dec 2011 18:47:58 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: next-20111220~107^2~6^2
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=42a3b63bb2ca4996a3d1210a004eae2333f1119e

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

42a3b63bb2ca4996a3d1210a004eae2333f1119e