From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 10 Apr 2013 14:39:27 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.10-rc1~66^2~178^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d3641409a05dcb8e28116bb2ad638f5a42805d9d;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

Conflicts:
	drivers/net/wireless/rt2x00/rt2x00pci.c
	net/mac80211/sta_info.c
	net/wireless/core.h
---

d3641409a05dcb8e28116bb2ad638f5a42805d9d