David S. Miller 198d6ba4d7 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/isdn/i4l/isdn_net.c
	fs/cifs/connect.c

2008-11-18 23:38:23 -08:00

..

atl1.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-11-18 23:38:23 -08:00

atl1.h

atlx: timer cleanup

2008-11-02 08:00:15 -05:00

atl2.c

drivers/net: Kill now superfluous ->last_rx stores.

2008-11-03 21:11:17 -08:00

atl2.h

atlx: use embedded net_device_stats

2008-11-02 07:59:55 -05:00

atlx.c

atlx: use embedded net_device_stats

2008-11-02 07:59:55 -05:00

atlx.h

atl1: bump version number

2008-05-13 01:30:25 -04:00

Makefile

atl2: add atl2 driver

2008-09-18 11:34:52 -04:00