Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 00:21:02 +0000 (17:21 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 00:21:02 +0000 (17:21 -0700)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge