From: Jiri Kosina <jkosina@suse.cz>
Date: Sun, 4 Jan 2009 00:04:09 +0000 (+0100)
Subject: Merge branch 'upstream-fixes' into for-next
X-Git-Tag: v2.6.29-rc1~498^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ed42350e02bfcb333024949e9653d06916135cc5;p=linux.git

Merge branch 'upstream-fixes' into for-next

Conflicts:

	drivers/hid/hid-ids.h
---

ed42350e02bfcb333024949e9653d06916135cc5
diff --cc drivers/hid/hid-ids.h
index daced0bf9d49,63aaa0ff3971..acc1abc834a4
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -138,6 -141,13 +138,9 @@@
  #define USB_DEVICE_ID_CYPRESS_BARCODE_1	0xde61
  #define USB_DEVICE_ID_CYPRESS_BARCODE_2	0xde64
  
+ #define USB_VENDOR_ID_DEALEXTREAME	0x10c5
+ #define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701	0x819a
+ 
 -#define USB_VENDOR_ID_DELL		0x413c
 -#define USB_DEVICE_ID_DELL_W7658	0x2005
 -#define USB_DEVICE_ID_DELL_SK8115	0x2105
 -
  #define USB_VENDOR_ID_DELORME		0x1163
  #define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100
  #define USB_DEVICE_ID_DELORME_EM_LT20	0x0200