Merge branch 'upstream-fixes' into for-next
authorJiri Kosina <jkosina@suse.cz>
Sun, 4 Jan 2009 00:04:09 +0000 (01:04 +0100)
committerJiri Kosina <jkosina@suse.cz>
Sun, 4 Jan 2009 00:04:09 +0000 (01:04 +0100)
Conflicts:

drivers/hid/hid-ids.h

1  2 
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hidraw.c

Simple merge
index daced0bf9d4938fc91f8b6e80e508596c5be4ee3,63aaa0ff3971714f2c7de934eec2ed7189322e42..acc1abc834a471e1cf61789950a027b8c6c1e7ab
  #define USB_DEVICE_ID_CYPRESS_BARCODE_1       0xde61
  #define USB_DEVICE_ID_CYPRESS_BARCODE_2       0xde64
  
 -#define USB_VENDOR_ID_DELL            0x413c
 -#define USB_DEVICE_ID_DELL_W7658      0x2005
 -#define USB_DEVICE_ID_DELL_SK8115     0x2105
 -
+ #define USB_VENDOR_ID_DEALEXTREAME    0x10c5
+ #define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701       0x819a
  #define USB_VENDOR_ID_DELORME         0x1163
  #define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100
  #define USB_DEVICE_ID_DELORME_EM_LT20 0x0200
Simple merge