From: David S. Miller <davem@davemloft.net>
Date: Sat, 7 Feb 2009 10:52:44 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.30-rc1~662^2~766
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=409f0a9014fe24d906ba21aaccff80eb7f7304da;p=~emulex%2Finfiniband.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
---

409f0a9014fe24d906ba21aaccff80eb7f7304da