From: John W. Linville Date: Wed, 15 Dec 2010 21:37:55 +0000 (-0500) Subject: Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v2.6.38-rc1~476^2~14^2~3^2~125 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=17b3c17ecde36db5db7760a2802990b3129a4d65;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git Merge branch 'wireless-next-2.6' of git://git./linux/kernel/git/iwlwifi/iwlwifi-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c drivers/net/wireless/iwlwifi/iwl-core.h --- 17b3c17ecde36db5db7760a2802990b3129a4d65