From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 7 Dec 2006 09:57:19 +0000 (-0500)
Subject: Merge branch 'master' into upstream
X-Git-Tag: v2.6.20-rc1~145^2^2~6^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d1413b28033c49c7f1a4d320e815d7a5531acee;p=pandora-kernel.git

Merge branch 'master' into upstream

Conflicts:

	drivers/net/netxen/netxen_nic.h
	drivers/net/netxen/netxen_nic_main.c
---

8d1413b28033c49c7f1a4d320e815d7a5531acee
Reading git-diff-tree failed