From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 23 Aug 2013 15:47:48 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.12-rc1~199^2~25^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=81ca2ff9450c2e983ee416eca17ebe6fa9c3da4f;p=kernel%2Fkernel-generic.git

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

81ca2ff9450c2e983ee416eca17ebe6fa9c3da4f