git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 5 Jan 2006 02:44:12 +0000 (18:44 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 5 Jan 2006 02:44:12 +0000 (18:44 -0800)
commit	1e7725df971bb176f355008d64a2952a08b68ab8
tree	0a4ba12447a0cabc800adc7e9667d284777b0181	tree \| snapshot
parent	69942f3a23182b70f822b844e11299c0c0a5c0b5	commit \| diff
parent	84bd14de4e5eb03bdd4a1935fdde5672845a66c7	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

Trivial manual merge fixup for usb_find_interface clashes.

Linux Kernel Source Tree.