4 commits

Author	SHA1	Message	Date
David S. Miller	b2f8f7525c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/forcedeth.c	2009-06-03 02:43:41 -07:00
Matt Kraai	cf4ae4e3de	net/firmare: Ignore .cis files ... Signed-off-by: Matt Kraai <kraai@ftbfs.org> Signed-off-by: David S. Miller <davem@davemloft.net>	2009-05-29 22:06:33 -07:00
Ken Kawasaki	f0a3a1538d	3c589_cs: add cis(firmware) of 3Com multifunction pcmcia card ... 3c589_cs,3c574_cs,serial_cs: (1)add cis(firmware) of 3Com lan&modem mulitifunction pcmcia card. (2)load correct configuration register for 3Com card Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp> Signed-off-by: David S. Miller <davem@davemloft.net>	2009-05-01 19:21:26 -07:00
Ken Kawasaki	99b28c4709	pcnet_cs: add cis(firmware) of the Allied Telesis LA-PCM ... pcnet_cs: add cis(firmware) of the Allied Telesis LA-PCM Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp> Signed-off-by: David S. Miller <davem@davemloft.net>	2009-04-21 02:06:14 -07:00