From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 11 Jun 2012 18:50:59 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b6038961dfeed49533e43fbedd86951a16cb4d2c;p=linux-beck.git

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-eeprom.c
---

b6038961dfeed49533e43fbedd86951a16cb4d2c