From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 21 Jun 2013 19:42:30 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7d2a47aab2a511c87a96238977e04e6378969d45;p=linux-beck.git

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

Conflicts:
	net/wireless/nl80211.c
---

7d2a47aab2a511c87a96238977e04e6378969d45