Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 5 Oct 2005 06:11:33 +0000 (02:11 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 5 Oct 2005 06:11:33 +0000 (02:11 -0400)
commit0d69ae5fb7eb9ba3b54cf0ba4ef5ae591f31eef7
treebe441bfa1e76035c00b66a3b06fea66cfd63d594
parent13d1ef29bc5125d7b77c5f6cdfde5ed31226005c
parent9bc39bec87ee3e35897fe27441e979e7c208f624
Merge branch 'master'
drivers/net/tokenring/ibmtr.c
drivers/net/wireless/orinoco.c