From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 5 Jan 2011 19:35:41 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.12-rc1~7851^2~14^2~3^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6303710d7aa62bfb154cd13ab5ab12cfa8baaf91;p=kernel%2Fkernel-generic.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6
---

6303710d7aa62bfb154cd13ab5ab12cfa8baaf91