bk://kernel.bkbits.net/gregkh/linux/usb-2.6
greg@kroah.com|ChangeSet|20040630174826|37656 greg
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/06/30 11:38:35-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/input/hid-core.c
# 2004/06/30 11:38:31-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/30 10:48:26-07:00 greg@kroah.com
# [PATCH] USB: add 3 Phidget device ids to the HID blacklist.
#
# drivers/usb/input/hid-core.c
# 2004/06/30 10:25:19-07:00 greg@kroah.com +8 -0
# USB: add 3 Phidget device ids to the HID blacklist.
#
# ChangeSet
# 2004/06/29 21:31:17-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# fs/aio.c
# 2004/06/29 21:31:13-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# MAINTAINERS
# 2004/06/29 21:31:13-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# CREDITS
# 2004/06/29 21:31:13-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/28 19:30:55-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# fs/aio.c
# 2004/06/28 19:30:52-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/28 00:43:18-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# arch/ppc/defconfig
# 2004/06/28 00:43:14-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ia64/defconfig
# 2004/06/28 00:43:14-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/24 18:40:41-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/06/24 18:40:37-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/24 13:02:42-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/media/pwc-if.c
# 2004/06/24 13:02:39-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/media/Kconfig
# 2004/06/24 13:02:39-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/gadget/ether.c
# 2004/06/24 13:02:39-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/24 13:01:44-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/06/24 13:01:40-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# MAINTAINERS
# 2004/06/24 13:01:40-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# CREDITS
# 2004/06/24 13:01:40-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/22 12:28:34-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# drivers/usb/core/devio.c
# 2004/06/22 12:28:30-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# MAINTAINERS
# 2004/06/22 12:28:30-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/20 23:36:26-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# CREDITS
# 2004/06/20 23:36:01-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/19 15:38:35-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# arch/ia64/defconfig
# 2004/06/19 15:38:31-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/18 12:32:27-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/storage/scsiglue.c
# 2004/06/18 12:32:23-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/media/Kconfig
# 2004/06/18 12:32:23-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/18 12:31:30-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/06/18 12:31:26-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/storage/scsiglue.c
# 2004/06/18 12:31:26-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# MAINTAINERS
# 2004/06/18 12:31:26-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# CREDITS
# 2004/06/18 12:31:26-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/15 22:24:54-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/06/15 22:24:51-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/13 11:33:57-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/input/hiddev.c
# 2004/06/13 11:33:54-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/message.c
# 2004/06/13 11:33:54-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/13 11:33:07-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# MAINTAINERS
# 2004/06/13 11:33:04-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/10 13:10:48-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/media/pwc-if.c
# 2004/06/10 13:10:45-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/input/hiddev.c
# 2004/06/10 13:10:45-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/input/hid-core.c
# 2004/06/10 13:10:45-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/devio.c
# 2004/06/10 13:10:44-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/09 12:17:34-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/core/usb.c
# 2004/06/09 12:17:31-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/08 22:02:51-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# include/linux/usb.h
# 2004/06/08 22:02:48-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/serial/cyberjack.c
# 2004/06/08 22:02:48-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/media/pwc-if.c
# 2004/06/08 22:02:48-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/media/Kconfig
# 2004/06/08 22:02:48-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/gadget/ether.c
# 2004/06/08 22:02:48-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/devio.c
# 2004/06/08 22:02:48-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/08 12:41:28-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/usb.h
# 2004/06/08 12:41:24-07:00 akpm@bix.(none) +0 -1
# Auto merged
#
# drivers/usb/serial/cyberjack.c
# 2004/06/08 12:41:24-07:00 akpm@bix.(none) +0 -6
# Auto merged
#
# drivers/usb/media/pwc-if.c
# 2004/06/08 12:41:24-07:00 akpm@bix.(none) +0 -1
# Auto merged
#
# drivers/usb/media/Kconfig
# 2004/06/08 12:41:24-07:00 akpm@bix.(none) +0 -1
# Auto merged
#
# drivers/usb/core/devio.c
# 2004/06/08 12:41:24-07:00 akpm@bix.(none) +0 -1
# Auto merged
#
# ChangeSet
# 2004/06/07 20:07:13-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# include/linux/usb.h
# 2004/06/07 20:07:10-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/gadget/ether.c
# 2004/06/07 20:07:10-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/07 14:23:17-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/gadget/ether.c
# 2004/06/07 14:23:13-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/message.c
# 2004/06/07 14:23:13-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/07 14:22:27-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# drivers/usb/input/hiddev.c
# 2004/06/07 14:22:24-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/05 17:09:11-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# MAINTAINERS
# 2004/06/05 17:09:08-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/04 02:41:08-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# drivers/usb/gadget/ether.c
# 2004/06/04 02:41:05-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/03 10:45:02-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/06/03 10:44:58-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/02 23:58:29-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/core/usb.c
# 2004/06/02 23:58:25-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/02 13:38:13-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/core/message.c
# 2004/06/02 13:38:09-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/02 13:37:23-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/06/02 13:37:20-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/01 13:57:49-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# MAINTAINERS
# 2004/06/01 13:57:45-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/30 00:23:52-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# MAINTAINERS
# 2004/05/30 00:23:48-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# CREDITS
# 2004/05/30 00:23:48-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/28 17:18:45-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/05/28 17:18:42-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/28 14:16:41-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/input/hiddev.c
# 2004/05/28 14:16:37-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/28 14:15:52-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/05/28 14:15:49-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# MAINTAINERS
# 2004/05/28 14:15:48-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/25 13:48:31-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/input/hiddev.c
# 2004/05/25 13:48:27-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/usb.c
# 2004/05/25 13:48:27-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/message.c
# 2004/05/25 13:48:27-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/25 13:47:38-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# MAINTAINERS
# 2004/05/25 13:47:34-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/24 11:48:01-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/05/24 11:47:57-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/22 23:48:51-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/05/22 23:48:48-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# MAINTAINERS
# 2004/05/22 23:48:48-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/21 19:09:03-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# arch/ia64/defconfig
# 2004/05/21 19:09:00-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# MAINTAINERS
# 2004/05/21 19:09:00-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/19 18:31:55-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# MAINTAINERS
# 2004/05/19 18:31:52-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/19 00:07:04-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/usb.h
# 2004/05/19 00:07:01-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# include/linux/pci_ids.h
# 2004/05/19 00:07:01-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/usb.c
# 2004/05/19 00:07:01-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ppc/defconfig
# 2004/05/19 00:07:01-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ppc/configs/pmac_defconfig
# 2004/05/19 00:07:01-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ppc/configs/common_defconfig
# 2004/05/19 00:07:01-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/18 14:54:09-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/usb.h
# 2004/05/18 14:54:06-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# include/linux/pci_ids.h
# 2004/05/18 14:54:06-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/input/hid-core.c
# 2004/05/18 14:54:06-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/usb.c
# 2004/05/18 14:54:06-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# CREDITS
# 2004/05/18 14:54:06-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/16 01:52:25-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/05/16 01:52:22-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/14 21:45:47-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/05/14 21:45:43-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/14 09:41:12-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/input/hid-core.c
# 2004/05/14 09:41:09-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/usb.c
# 2004/05/14 09:41:09-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/message.c
# 2004/05/14 09:41:09-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/12 20:32:44-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/core/inode.c
# 2004/05/12 20:32:41-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# MAINTAINERS
# 2004/05/12 20:32:41-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/12 01:26:11-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/input/wacom.c
# 2004/05/12 01:26:08-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/input/hid-core.c
# 2004/05/12 01:26:08-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/12 01:25:17-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/05/12 01:25:14-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/parisc/configs/c3000_defconfig
# 2004/05/12 01:25:14-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# MAINTAINERS
# 2004/05/12 01:25:14-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/05 14:52:58-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/core/message.c
# 2004/05/05 14:52:55-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/05 14:52:11-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# CREDITS
# 2004/05/05 14:52:08-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/04 14:13:11-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# include/linux/usb.h
# 2004/05/04 14:13:08-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/01 15:23:25-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# MAINTAINERS
# 2004/05/01 15:23:22-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/04/30 22:06:45-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# drivers/usb/core/inode.c
# 2004/04/30 22:06:42-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/04/29 16:00:47-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/04/29 16:00:44-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# MAINTAINERS
# 2004/04/29 16:00:44-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/04/28 13:38:52-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/input/hid-core.c
# 2004/04/28 13:38:49-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/04/27 19:39:13-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# include/linux/usb.h
# 2004/04/27 19:39:10-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/usb.c
# 2004/04/27 19:39:10-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/message.c
# 2004/04/27 19:39:10-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/04/26 18:31:48-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# include/linux/usb.h
# 2004/04/26 18:31:45-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/usb.c
# 2004/04/26 18:31:45-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/04/25 23:06:05-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/04/25 23:06:02-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/04/24 23:51:05-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/core/usb.c
# 2004/04/24 23:51:02-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/04/23 12:58:38-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# CREDITS
# 2004/04/23 12:58:35-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/04/19 19:45:10-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/04/19 19:45:07-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# MAINTAINERS
# 2004/04/19 19:45:07-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# CREDITS
# 2004/04/19 19:45:06-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/04/07 20:17:13-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/core/message.c
# 2004/04/07 20:17:11-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/04/02 11:35:28-08:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# include/linux/pci_ids.h
# 2004/04/02 11:35:25-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/04/01 15:16:14-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# CREDITS
# 2004/04/01 15:16:11-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/31 19:24:39-08:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# include/linux/usb.h
# 2004/03/31 19:24:37-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/usb.c
# 2004/03/31 19:24:37-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/message.c
# 2004/03/31 19:24:37-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ppc64/defconfig
# 2004/03/31 19:24:36-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ppc64/configs/pSeries_defconfig
# 2004/03/31 19:24:36-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ppc/defconfig
# 2004/03/31 19:24:36-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ppc/configs/pmac_defconfig
# 2004/03/31 19:24:36-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ppc/configs/common_defconfig
# 2004/03/31 19:24:36-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/parisc/configs/c3000_defconfig
# 2004/03/31 19:24:36-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ia64/defconfig
# 2004/03/31 19:24:36-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ia64/configs/zx1_defconfig
# 2004/03/31 19:24:36-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ia64/configs/generic_defconfig
# 2004/03/31 19:24:36-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/arm/configs/neponset_defconfig
# 2004/03/31 19:24:36-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/30 20:18:36-08:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# arch/ppc64/defconfig
# 2004/03/30 20:18:33-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ppc64/configs/pSeries_defconfig
# 2004/03/30 20:18:33-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ppc/defconfig
# 2004/03/30 20:18:33-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ppc/configs/pmac_defconfig
# 2004/03/30 20:18:33-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ppc/configs/common_defconfig
# 2004/03/30 20:18:33-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/parisc/configs/c3000_defconfig
# 2004/03/30 20:18:33-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ia64/defconfig
# 2004/03/30 20:18:33-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ia64/configs/zx1_defconfig
# 2004/03/30 20:18:33-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ia64/configs/generic_defconfig
# 2004/03/30 20:18:33-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/arm/configs/neponset_defconfig
# 2004/03/30 20:18:32-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/30 12:09:32-08:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# include/linux/usb.h
# 2004/03/30 12:09:29-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/usb.c
# 2004/03/30 12:09:29-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/message.c
# 2004/03/30 12:09:29-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/29 18:05:43-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# MAINTAINERS
# 2004/03/29 18:05:41-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/29 13:51:58-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# CREDITS
# 2004/03/29 13:51:56-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/28 12:29:41-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# drivers/usb/core/message.c
# 2004/03/28 12:29:38-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/27 02:28:18-08:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# drivers/usb/input/wacom.c
# 2004/03/27 02:28:16-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/26 12:24:49-08:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# include/linux/usb_gadget.h
# 2004/03/26 12:24:46-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/usb.c
# 2004/03/26 12:24:46-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/20 13:26:55-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# CREDITS
# 2004/03/20 13:26:53-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/16 21:53:42-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# drivers/usb/input/wacom.c
# 2004/03/16 21:53:39-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/input/hid-core.c
# 2004/03/16 21:53:39-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/16 12:59:58-08:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
# into bix.(none):/usr/src/bk-usb
#
# include/linux/usb_gadget.h
# 2004/03/16 12:59:47-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# include/linux/usb.h
# 2004/03/16 12:59:47-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/usb.c
# 2004/03/16 12:59:46-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# MAINTAINERS
# 2004/03/16 12:59:46-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# CREDITS
# 2004/03/16 12:59:46-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/16 12:58:57-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# drivers/usb/input/wacom.c
# 2004/03/16 12:58:47-08:00 akpm@bix.(none) +0 -4
# Auto merged
#
# drivers/usb/input/hid-core.c
# 2004/03/16 12:58:47-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# CREDITS
# 2004/03/16 12:58:46-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/14 11:03:00-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# include/linux/usb_gadget.h
# 2004/03/14 11:02:47-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# include/linux/usb.h
# 2004/03/14 11:02:47-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/usb/core/usb.c
# 2004/03/14 11:02:47-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# MAINTAINERS
# 2004/03/14 11:02:47-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/12 10:57:17-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-usb
#
# MAINTAINERS
# 2004/03/12 10:57:02-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# CREDITS
# 2004/03/12 10:57:01-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
diff -Nru a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
--- a/drivers/usb/input/hid-core.c 2004-06-30 11:39:34 -07:00
+++ b/drivers/usb/input/hid-core.c 2004-06-30 11:39:34 -07:00
@@ -1425,6 +1425,9 @@
#define USB_VENDOR_ID_GLAB 0x06c2
#define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038
#define USB_DEVICE_ID_1_PHIDGETSERVO_30 0x0039
+#define USB_DEVICE_ID_8_8_8_IF_KIT 0x0045
+#define USB_DEVICE_ID_0_0_4_IF_KIT 0x0040
+#define USB_DEVICE_ID_0_8_8_IF_KIT 0x0053
#define USB_VENDOR_ID_WISEGROUP 0x0925
#define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101
@@ -1483,8 +1486,13 @@
{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 7, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_VOLITO, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PTU, HID_QUIRK_IGNORE },
+
{ USB_VENDOR_ID_GLAB, USB_DEVICE_ID_4_PHIDGETSERVO_30, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_GLAB, USB_DEVICE_ID_1_PHIDGETSERVO_30, HID_QUIRK_IGNORE },
+ { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_8_8_8_IF_KIT, HID_QUIRK_IGNORE },
+ { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_0_4_IF_KIT, HID_QUIRK_IGNORE },
+ { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_8_IF_KIT, HID_QUIRK_IGNORE },
+
{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20, HID_QUIRK_IGNORE },