From: David S. Miller Date: Wed, 11 Nov 2009 19:38:16 +0000 (-0800) Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2071a0084a0323697b7d6fd5a98982194bd6929f;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git Merge branch 'master' of /linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h --- 2071a0084a0323697b7d6fd5a98982194bd6929f