From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 19 Jun 2012 18:41:22 +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=b3c911eeb47d08aada986f769b6a060794dfe9d0;p=linux-beck.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/dvm/testmode.c
	drivers/net/wireless/iwlwifi/pcie/trans.c
---

b3c911eeb47d08aada986f769b6a060794dfe9d0