linux - linux

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of ↵	David S. Miller	2009-06-03	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/forcedeth.c
\| *	net/firmare: Ignore .cis files	Matt Kraai	2009-05-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \|	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	Ken Kawasaki	2009-05-02	2	-0/+26
\|/ \| \| \| \| \| \| \| \| \|	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	Ken Kawasaki	2009-04-21	1	-0/+20
	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>