tree bae406a4b17229dcce7c11be5073f7a67665e477
parent d29cecda036f251aee4947f47eea0fe9ed8cc931
parent 96fa2b508d2d3fe040cf4ef2fffb955f0a537ea1
author David S. Miller <davem@davemloft.net> 1260055346 -0800
committer David S. Miller <davem@davemloft.net> 1260055346 -0800

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