From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 24 Jun 2011 18:00:24 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.0-rc6~16^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=acc468f5f9616ba564b772ac8a3aef218bff6bb3;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

acc468f5f9616ba564b772ac8a3aef218bff6bb3