David S. Miller d5df2a1613 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/bnx2x_main.c drivers/net/wireless/iwlwifi/iwl3945-base.c drivers/net/wireless/rt2x00/rt73usb.c		2009-03-10 05:04:16 -07:00
..
Kconfig	p54spi: p54spi driver	2009-01-29 16:00:25 -05:00
Makefile	p54spi: p54spi driver	2009-01-29 16:00:25 -05:00
net2280.h	drivers/net/wireless/p54/net2280.h: silence checkpatch.pl	2008-04-08 16:44:45 -04:00
p54.h	wireless: restrict to 32 legacy rates	2009-01-29 16:01:09 -05:00
p54common.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-03-10 05:04:16 -07:00
p54common.h	p54: longbow frontend support	2009-01-29 16:00:24 -05:00
p54pci.c	p54: prevent upload of wrong firmwares	2009-01-29 15:59:39 -05:00
p54pci.h	p54pci: cache firmware for suspend/resume	2008-11-25 16:41:38 -05:00
p54spi.c	p54spi: remove arch specific dependencies	2009-01-29 16:00:44 -05:00
p54spi.h	p54spi: remove arch specific dependencies	2009-01-29 16:00:44 -05:00
p54spi_eeprom.h	p54spi: stlc45xx eeprom blob	2009-01-29 16:00:25 -05:00
p54usb.c	p54usb: fix conflict with recent usb changes	2009-01-29 16:00:43 -05:00
p54usb.h	p54usb: utilize usb_reset_device for 3887	2009-01-29 15:59:39 -05:00