From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 11 Jun 2012 18:36: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~2946^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed6be3dcfee0bb891efd6ea908ca32bea711085b;p=kernel%2Fkernel-generic.git

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

ed6be3dcfee0bb891efd6ea908ca32bea711085b