From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 29 Apr 2013 19:31:57 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.10-rc1~132^2~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17a2911f3395d66694fcbd2e8970015904d9b034;p=thirdparty%2Fkernel%2Flinux.git

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

17a2911f3395d66694fcbd2e8970015904d9b034