From: John W. Linville Date: Wed, 22 Dec 2010 19:27:21 +0000 (-0500) 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=63e35cd9bd4c8ae085c8b9a70554595b529c4100;p=linux-beck.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem Conflicts: drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h --- 63e35cd9bd4c8ae085c8b9a70554595b529c4100