From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 2 Feb 2010 22:10:39 +0000 (+0100)
Subject: Merge branch 'master' into upstream
X-Git-Tag: v2.6.34-rc1~293^2~17
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=e1a0bdd8022317e98650e70850de73eccfcde5ad;p=karo-tx-linux.git

Merge branch 'master' into upstream

Conflicts:
	drivers/hid/hid-ids.h
---

e1a0bdd8022317e98650e70850de73eccfcde5ad
diff --cc drivers/hid/hid-ids.h
index bb5f4fa479ad,010368e649ed..39ff98a5bd61
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -169,9 -169,9 +172,12 @@@
  #define USB_VENDOR_ID_ESSENTIAL_REALITY	0x0d7f
  #define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100
  
 +#define USB_VENDOR_ID_ETURBOTOUCH	0x22b9
 +#define USB_DEVICE_ID_ETURBOTOUCH	0x0006
 +
+ #define USB_VENDOR_ID_ETT		0x0664
+ #define USB_DEVICE_ID_TC5UH		0x0309
+ 
  #define USB_VENDOR_ID_EZKEY 		0x0518
  #define USB_DEVICE_ID_BTC_8193		0x0002