Merge pobox.com:/garz/repo/linux-2.6

into pobox.com:/garz/repo/net-drivers-2.6

diff --cc drivers/net/8139cp.c
Simple merge

diff --cc drivers/net/depca.c
Simple merge

diff --cc drivers/net/tokenring/lanstreamer.c
Simple merge

diff --cc drivers/net/tulip/dmfe.c
Simple merge