From: David S. Miller <davem@davemloft.net>
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-Tag: firefly_0821_release~9833^2~3968^2~416
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2071a0084a0323697b7d6fd5a98982194bd6929f;p=firefly-linux-kernel-4.4.55.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