linux.git/firmware/cis, branch v2.6.31 Linux kernel source tree Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-06-03T09:43:41+00:00 David S. Miller davem@davemloft.net 2009-06-03T09:43:41+00:00 b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768 Conflicts: drivers/net/forcedeth.c 
Conflicts:
	drivers/net/forcedeth.c
net/firmare: Ignore .cis files 2009-05-30T05:06:33+00:00 Matt Kraai kraai@ftbfs.org 2009-05-30T05:06:33+00:00 cf4ae4e3de83e2c7394af70b46f4f50e5f0fb90c Signed-off-by: Matt Kraai <kraai@ftbfs.org> Signed-off-by: David S. Miller <davem@davemloft.net> 
Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
3c589_cs: add cis(firmware) of 3Com multifunction pcmcia card 2009-05-02T02:21:26+00:00 Ken Kawasaki ken_kawasaki@spring.nifty.jp 2009-05-02T02:21:26+00:00 f0a3a1538d57dfb51c73d012cbb72f985cd419aa 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> 
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>
pcnet_cs: add cis(firmware) of the Allied Telesis LA-PCM 2009-04-21T09:06:14+00:00 Ken Kawasaki ken_kawasaki@spring.nifty.jp 2009-04-18T13:44:44+00:00 99b28c47091db2bb7f594a5088831d341a800a33 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> 
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>