David S. Miller 28b4d5cc17 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/net/pcmcia/fmvj18x_cs.c
	drivers/net/pcmcia/nmclan_cs.c
	drivers/net/pcmcia/xirc2ps_cs.c
	drivers/net/wireless/ray_cs.c

2009-12-05 15:22:26 -08:00

..

Kconfig

staging/wireless: don't build when NET etc. are not enabled

2009-11-11 15:23:48 -05:00

Makefile

netwave: move driver to staging

2009-10-30 16:50:34 -04:00

netwave_cs.c

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-12-05 15:22:26 -08:00

TODO

Staging: netwave: add TODO file

2009-10-30 16:50:36 -04:00