From: Jiri Kosina Date: Wed, 19 May 2010 12:05:06 +0000 (+0200) Subject: Merge branches 'upstream-fixes', 'bkl-removal', 'debugfs-fixes' and 'hid-suspend... X-Git-Tag: v2.6.35-rc1~454^2~4 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ef77ad5e67447b3744574c29b97da6677d6d3f18 Merge branches 'upstream-fixes', 'bkl-removal', 'debugfs-fixes' and 'hid-suspend' into for-linus --- ef77ad5e67447b3744574c29b97da6677d6d3f18 diff --cc drivers/hid/hid-core.c index 69fdf1e2347b,143e788b729b,2e2aa759d230,86cb2c47e9ea,2e2aa759d230..33cac4890ca4 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@@@@@ -1288,9 -1290,8 -1295,7 -1288,7 -1295,7 +1281,9 @@@@@@ static const struct hid_device_id hid_b { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) }, ++++ { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) }, +++ { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) }, { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) }, { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },