]> git.hungrycats.org Git - linux/commit
Hand-merge typhoon and wavelan_cs conflicts, when
authorJeff Garzik <jgarzik@pobox.com>
Tue, 19 Oct 2004 08:20:09 +0000 (04:20 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 19 Oct 2004 08:20:09 +0000 (04:20 -0400)
commitcff19dd72acb657530b0dceeababf733cec55400
tree41e976f23b9ae19b79d5f7b96bd86286f91dbc41
parent177662fb2561278542da169b3bbe9961aad86188
parentea110b982d766db51ea77071b1de2ec3f3b163f2
Hand-merge typhoon and wavelan_cs conflicts, when
merging viro's ETH* patches.
drivers/net/typhoon.c
drivers/net/wireless/wavelan_cs.c