]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 02:44:12 +0000 (18:44 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 02:44:12 +0000 (18:44 -0800)
commitdb9edfd7e339ca4113153d887e782dd05be5a9eb
tree0a4ba12447a0cabc800adc7e9667d284777b0181
parent631b034724364b413e8a52e7c2e03a9d77e4c2b4
parentfd586bacf439f36dea9b9bf6e6133ac87df2730c
Merge git://git./linux/kernel/git/gregkh/driver-2.6

Trivial manual merge fixup for usb_find_interface clashes.
MAINTAINERS
drivers/scsi/ipr.c
drivers/usb/core/usb.c
include/linux/sysctl.h
include/linux/usb.h
init/Kconfig