q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/drivers/hid
History
Linus Torvalds 5cc1035062 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (141 commits)
  USB: mct_u232: fix broken close
  USB: gadget: amd5536udc.c: fix error path
  USB: imx21-hcd - fix off by one resource size calculation
  usb: gadget: fix Kconfig warning
  usb: r8a66597-udc: Add processing when USB was removed.
  mxc_udc: add workaround for ENGcm09152 for i.MX35
  USB: ftdi_sio: add device ids for ScienceScope
  USB: musb: AM35x: Workaround for fifo read issue
  USB: musb: add musb support for AM35x
  USB: AM35x: Add musb support
  usb: Fix linker errors with CONFIG_PM=n
  USB: ohci-sh - use resource_size instead of defining its own resource_len macro
  USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro
  USB: isp116x-hcd - use resource_size instead of defining its own resource_len macro
  USB: xhci: Fix compile error when CONFIG_PM=n
  USB: accept some invalid ep0-maxpacket values
  USB: xHCI: PCI power management implementation
  USB: xHCI: bus power management implementation
  USB: xHCI: port remote wakeup implementation
  USB: xHCI: port power management implementation
  ...

Manually fix up (non-data) conflict: the SCSI merge gad renamed the
'hw_sector_size' member to 'physical_block_size', and the USB tree
brought a new use of it.
 		2010-10-22 20:30:48 -07:00
..
usbhid Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
Kconfig Merge branch 'acrux' into for-linus 2010-08-04 15:29:35 +02:00
Makefile Merge branch 'acrux' into for-linus 2010-08-04 15:29:35 +02:00
hid-3m-pct.c Merge branch 'upstream' into for-linus 2010-05-19 14:04:49 +02:00
hid-a4tech.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hid-apple.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hid-axff.c HID: add ACRUX game controller force feedback support 2010-07-19 12:13:23 +02:00
hid-belkin.c HID: adding __init/__exit macros to module init/exit functions 2009-07-23 01:28:01 +02:00
hid-cando.c HID: Add Cando touch screen 15.6-inch product id 2010-10-13 10:47:32 +02:00
hid-cherry.c HID: add support for cymotion master solar keyboard 2010-04-08 13:40:52 +02:00
hid-chicony.c HID: adding __init/__exit macros to module init/exit functions 2009-07-23 01:28:01 +02:00
hid-core.c USB: add driver for Meywa-Denki & Kayac YUREX 2010-10-22 10:21:51 -07:00
hid-cypress.c HID: add support for Acan FG-8100 barcode reader 2009-12-02 22:54:11 +01:00
hid-debug.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
hid-drff.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hid-egalax.c USB HID: Add ID for eGalax Multitouch used in JooJoo tablet 2010-08-16 16:01:28 +02:00
hid-elecom.c HID: add proper support for Elecom BM084 bluetooth mouse 2010-06-28 19:02:47 +02:00
hid-ezkey.c HID: adding __init/__exit macros to module init/exit functions 2009-07-23 01:28:01 +02:00
hid-gaff.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hid-gyration.c HID: Add the GYR4101US USB ID to hid-gyration 2010-05-24 19:07:57 +02:00
hid-ids.h USB: add driver for Meywa-Denki & Kayac YUREX 2010-10-22 10:21:51 -07:00
hid-input.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 2010-08-04 15:23:49 -07:00
hid-kensington.c HID: adding __init/__exit macros to module init/exit functions 2009-07-23 01:28:01 +02:00
hid-kye.c HID: adding __init/__exit macros to module init/exit functions 2009-07-23 01:28:01 +02:00
hid-lg.c HID: add mappings for a few keys found on Logitech MX3200 2010-04-19 13:26:28 +02:00
hid-lg.h Merge branch 'master' into upstream 2010-02-02 23:10:39 +01:00
hid-lg2ff.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hid-lg3ff.c HID: add driver for the Logitech Flight System G940 2010-01-13 00:26:31 +01:00
hid-lgff.c HID: add driver for the Logitech Flight System G940 2010-01-13 00:26:31 +01:00
hid-magicmouse.c HID: magicmouse: Correct parsing of large X and Y motions. 2010-07-11 23:06:14 +02:00
hid-microsoft.c HID: adding __init/__exit macros to module init/exit functions 2009-07-23 01:28:01 +02:00
hid-monterey.c HID: adding __init/__exit macros to module init/exit functions 2009-07-23 01:28:01 +02:00
hid-mosart.c HID: add device ID for new Asus Multitouch Controller 2010-09-08 14:30:35 +02:00
hid-ntrig.c HID: ntrig: add support for new firwmare versions 2010-06-21 13:41:13 +02:00
hid-ortek.c HID: add support for Ortek WKB-2000 2010-01-26 01:57:35 +01:00
hid-petalynx.c HID: adding __init/__exit macros to module init/exit functions 2009-07-23 01:28:01 +02:00
hid-picolcd.c HID: picolcd: correct ordering of framebuffer freeing 2010-08-06 14:53:10 +02:00
hid-pl.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hid-prodikeys.c HID: Prodikeys PC-MIDI HID Driver 2010-05-12 15:18:59 +02:00
hid-quanta.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hid-roccat-kone.c HID: roccat: remove obsolete kone_abi_version sysfs attribute 2010-06-21 15:20:35 +02:00
hid-roccat-kone.h HID: roccat: remove obsolete kone_abi_version sysfs attribute 2010-06-21 15:20:35 +02:00
hid-roccat.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
hid-roccat.h HID: roccat: fix whitespace warning from checkpatch.pl 2010-05-31 13:53:21 +02:00
hid-samsung.c HID: hid-samsung: remove redundant key mappings 2010-05-18 10:41:19 +02:00
hid-sjoy.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hid-sony.c HID: sony: fix sony_set_operational_bt 2010-05-03 17:19:03 +02:00
hid-stantum.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hid-sunplus.c HID: adding __init/__exit macros to module init/exit functions 2009-07-23 01:28:01 +02:00
hid-tmff.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hid-topseed.c HID: add support for another BTC Emprex remote control 2010-08-30 15:43:25 +02:00
hid-twinhan.c HID: add __init/__exit macros to twinhan.c 2009-09-29 13:58:20 +02:00
hid-wacom.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2010-08-10 15:08:02 -07:00
hid-zpff.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hid-zydacron.c HID: add omitted hid-zydacron.c file 2010-05-17 20:58:47 +02:00
hidraw.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00