OSDN Git Service

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Sat, 29 Jul 2006 04:33:35 +0000 (00:33 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 29 Jul 2006 04:33:35 +0000 (00:33 -0400)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge