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

Conflicts:
	drivers/net/pcmcia/pcnet_cs.c
	net/caif/caif_socket.c

2010-10-06 19:39:31 -07:00

..

3c574_cs.c

drivers/net: Remove address use from assignments of function pointers

2010-08-25 15:35:43 -07:00

3c589_cs.c

drivers/net/pcmcia: Use static const char * const where possible

2010-09-14 20:22:03 -07:00

axnet_cs.c

drivers/net: Remove address use from assignments of function pointers

2010-08-25 15:35:43 -07:00

com20020_cs.c

drivers/net/pcmcia: Use pr_<level> and netdev_<level>

2010-08-18 14:26:30 -07:00

fmvj18x_cs.c

drivers/net/pcmcia: Use pr_<level> and netdev_<level>

2010-08-18 14:26:30 -07:00

ibmtr_cs.c

drivers/net/pcmcia: Use pr_<level> and netdev_<level>

2010-08-18 14:26:30 -07:00

Kconfig

[netdrvr] ibmtr: PCMCIA IBMTR is ok on 64bit

2008-10-16 05:40:16 -04:00

Makefile

…

nmclan_cs.c

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

pcnet_cs.c

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

2010-10-06 19:39:31 -07:00

smc91c92_cs.c

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

xirc2ps_cs.c

drivers/net/pcmcia: Use pr_<level> and netdev_<level>

2010-08-18 14:26:30 -07:00