David S. Miller bb803cfbec Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/scsi/fcoe/fcoe.c		2009-05-18 21:08:20 -07:00
..
Kconfig	p54: Kconfig maintenance	2009-03-27 20:13:18 -04:00
Makefile	p54spi: p54spi driver	2009-01-29 16:00:25 -05:00
net2280.h
p54.h	p54: correct merge damage from "p54: more SoftLED updates"	2009-05-06 15:15:03 -04:00
p54common.c	p54: call p54_wake_free_queues on every p54_free_skb and p54_rx_frame_sent	2009-05-06 15:15:05 -04:00
p54common.h	p54: initial SoftLED support	2009-03-16 18:09:28 -04:00
p54pci.c	Replace all DMA_nBIT_MASK macro with DMA_BIT_MASK(n)	2009-04-13 15:04:33 -07:00
p54pci.h	p54pci: cache firmware for suspend/resume	2008-11-25 16:41:38 -05:00
p54spi.c	p54spi: get rid of busy-wait loops	2009-04-22 16:54:41 -04: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: Fixes compile error with CONFIG_PM=n	2009-05-06 15:15:01 -04:00
p54usb.h	p54usb: rework driver for resume	2009-05-06 15:14:41 -04:00