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)
1  2 
drivers/net/tokenring/ibmtr.c
drivers/net/wireless/orinoco.c

Simple merge
Simple merge