Matt Carlson 13fa95b039 tg3: Fix std prod ring nicaddr for 5787 and 57765 ... Commit 87668d352a, titled "tg3: Don't touch RCB nic addresses", tried to avoid assigning the nic address of the standard producer ring. Unfortunately, the default nic address is not correct for the 5787, the 5755M, or the 57765. This patch reenables the old behavior and opts out of the assignment only for the 5717. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Tested-by: Chow Loong Jin <hyperair@ubuntu.com> Tested-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: David S. Miller <davem@davemloft.net>		2010-01-13 17:18:52 -08:00
..
accessibility
acpi	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq	2009-12-11 15:59:23 -08:00
amba
ata	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
atm	drivers/atm: Correct code taking the size of a pointer	2009-12-13 19:56:33 -08:00
auxdisplay
base	Driver core: fix race in dev_driver_string	2009-12-11 11:24:55 -08:00
block	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-11 12:18:16 -08:00
bluetooth	Bluetooth: Prevent ill-timed autosuspend in USB driver	2009-12-17 12:12:49 -08:00
cdrom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2009-12-09 19:03:16 -08:00
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2009-12-11 15:34:40 -08:00
clocksource
connector
cpufreq
cpuidle
crypto	Merge branch 'for-next' into for-linus	2009-12-07 18:36:35 +01:00
dca
dio	m68k: don't export static inline functions	2009-12-06 11:18:28 +01:00
dma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
edac	amd64_edac: bump driver version	2009-12-08 13:38:14 +01:00
eisa
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-12-11 15:22:27 -08:00
firmware	firmware_class: make request_firmware_nowait more useful	2009-12-11 11:24:52 -08:00
gpio
gpu	Merge branch 'drm-nouveau-pony' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-12-11 14:32:49 -08:00
hid	USB: remove the auto_pm flag	2009-12-11 11:55:21 -08:00
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2009-12-09 19:53:11 -08:00
i2c	Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2009-12-09 19:57:06 -08:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6	2009-12-09 19:45:38 -08:00
idle
ieee1394	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
ieee802154
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
input	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-11 12:18:16 -08:00
isdn	drivers/isdn: eliminate duplicated test	2010-01-03 21:25:54 -08:00
leds	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08:00
lguest
macintosh	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
mca
md	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
media	V4L/DVB (13592): max2165: 32bit build patch	2009-12-10 12:45:18 -02:00
memstick
message	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
mfd	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2009-12-09 19:52:01 -08:00
misc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2009-12-11 15:24:56 -08:00
mmc	tty: sdio_uart: Fix the locking on "func" for new code	2009-12-11 15:18:06 -08:00
mtd	Merge git://git.infradead.org/ubifs-2.6	2009-12-10 09:31:45 -08:00
net	tg3: Fix std prod ring nicaddr for 5787 and 57765	2010-01-13 17:18:52 -08:00
nubus
of
oprofile
parisc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
parport	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2009-12-08 08:13:35 -08:00
pci	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-11 12:18:16 -08:00
pcmcia	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-11 12:18:16 -08:00
platform	Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2009-12-09 19:57:06 -08:00
pnp	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-11 12:18:16 -08:00
power
pps
ps3
rapidio
regulator
rtc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
s390	claw: use "claw" as root device name	2010-01-07 00:27:07 -08:00
sbus
scsi	cxgb3i: Fix flags test.	2010-01-04 14:36:40 -08:00
serial	pcnet_cs: add cis of KTI PE520 pcmcia network card	2010-01-06 20:37:58 -08:00
sfi
sh
sn
spi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
ssb	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-05 15:22:26 -08:00
staging	Staging: batman: fix debug Kconfig option	2009-12-11 15:49:27 -08:00
tc
telephony	Merge branch 'for-next' into for-linus	2009-12-07 18:36:35 +01:00
thermal
uio
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2009-12-11 15:34:40 -08:00
uwb
video	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-11 12:18:16 -08:00
virtio
vlynq
w1
watchdog	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
xen	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-11 12:18:16 -08:00
zorro	m68k: don't export static inline functions	2009-12-06 11:18:28 +01:00
Kconfig
Makefile