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

Trivial manual merge fixup for usb_find_interface clashes.

2006-01-04 18:44:12 -08:00

..

bnep

…

cmtp

…

hidp

…

rfcomm

…

af_bluetooth.c

…

hci_conn.c

…

hci_core.c

…

hci_event.c

…

hci_sock.c

…

hci_sysfs.c

[PATCH] driver core: replace "hotplug" by "uevent"

2006-01-04 16:18:08 -08:00

Kconfig

…

l2cap.c

…

lib.c

…

Makefile

…

sco.c

…