]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Tue, 23 May 2006 21:20:58 +0000 (17:20 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 23 May 2006 21:20:58 +0000 (17:20 -0400)
1  2 
MAINTAINERS
drivers/net/wireless/orinoco.c

diff --cc MAINTAINERS
Simple merge
Simple merge