Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

author Linus Torvalds <torvalds@g5.osdl.org>

Thu, 5 Jan 2006 00:34:57 +0000 (16:34 -0800)

committer Linus Torvalds <torvalds@g5.osdl.org>

Thu, 5 Jan 2006 00:34:57 +0000 (16:34 -0800)
author Linus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:34:57 +0000 (16:34 -0800)
committer Linus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:34:57 +0000 (16:34 -0800)
diff --cc Documentation/scsi/scsi_mid_low_api.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/usb/class/usblp.c
Simple merge
diff --cc drivers/usb/serial/ftdi_sio.h
Simple merge
author	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 5 Jan 2006 00:34:57 +0000 (16:34 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 5 Jan 2006 00:34:57 +0000 (16:34 -0800)
		1	2
Documentation/scsi/scsi_mid_low_api.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/class/usblp.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/ftdi_sio.h	patch \|	diff1 \|	diff2 \|	blob \| history