summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
*---------. Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat'...Jiri Kosina2010-10-2320-213/+1928
|\ \ \ \ \ \
| | | | | | * HID: roccat: Normalized reported profile number for pyra button events.Stefan Achatz2010-09-011-1/+5
| | | | | | * HID: roccat: add driver for Roccat Pyra mouseStefan Achatz2010-09-017-0/+1259
| | | | | * | HID: ntrig: identify firmware versionRafi Rubin2010-09-081-0/+51
| | | | | * | HID: ntrig: a bit of whitespace cleanupRafi Rubin2010-08-301-9/+9
| | | | | * | HID: ntrig: add documentionRafi Rubin2010-08-301-0/+126
| | | | | |/
| | | | * | HID: magicmouse: Adjust major / minor axes to scaleHenrik Rydberg2010-10-011-2/+2
| | | | * | HID: magicmouse: Use hid-input parsing rather than bypassing itMichael Poole2010-09-241-63/+18
| | | | * | HID: magicmouse: enable Magic Trackpad supportChase Douglas2010-09-033-39/+155
| | | | * | HID: magicmouse: simplify touch data bit manipulationChase Douglas2010-09-031-12/+13
| | | | * | HID: magicmouse: simplify multitouch feature requestChase Douglas2010-09-031-12/+4
| | | | * | HID: magicmouse: remove timestamp logicChase Douglas2010-09-021-11/+7
| | | | * | HID: magicmouse: simplify touch down logicChase Douglas2010-09-021-18/+9
| | | | |/
| | | * | HID: force feedback support for Logitech RumblePad gamepadHendrik Iben2010-10-045-4/+9
| | | * | HID: Add support for Logitech Speed Force Wireless gaming wheelSimon Wood2010-09-227-0/+193
| | | * | HID: don't Send Feature Reports on Interrupt EndpointAlan Ott2010-09-221-1/+1
| | * | | HID: Fix for problems with eGalax/DWAV multi-touch-screenPhilipp Merkel2010-10-012-6/+11
| * | | | HID: 3m: Adjust major / minor axes to scaleHenrik Rydberg2010-09-221-4/+6
| * | | | HID: 3m: Correct touchscreen emulationHenrik Rydberg2010-09-211-36/+5
| * | | | HID: 3m: Convert to MT slotsHenrik Rydberg2010-09-211-11/+43
| * | | | HID: 3m: Output proper orientation rangeHenrik Rydberg2010-09-211-1/+1
| * | | | HID: 3m: Adjust to sequential MT HID protocolHenrik Rydberg2010-09-211-4/+18
| * | | | HID: Add a hid quirk for input sync overrideHenrik Rydberg2010-09-212-0/+4
| | |/ / | |/| |
| | | |
| \ \ \
*-. \ \ \ Merge branches 'upstream' and 'upstream-fixes' into for-linusJiri Kosina2010-10-2313-98/+174
|\ \ \ \ \
| | * | | | HID: hidraw: fix window in hidraw_releaseJiri Slaby2010-10-201-4/+10
| | | |/ / | | |/| |
| * | | | HID: hid-sony: override usbhid_output_raw_report for SixaxisAntonio Ospite2010-10-201-1/+22
| * | | | HID: add absolute axis resolution calculationNikolai Kondrashov2010-10-151-0/+80
| * | | | HID: support STmicroelectronics and Sitronix with hid-stantuml driverPascal Auriel - Stantum2010-10-013-0/+10
| * | | | HID: add NOGET quirk for AXIS 295 Video Surveillance JoystickRok Mandeljc2010-10-012-0/+2
| * | | | HID: usbhid: remove unused hiddev_driverAlan Stern2010-09-243-50/+0
| * | | | Merge branch 'master' into upstreamJiri Kosina2010-09-241076-14264/+16397
| |\| | |
| * | | | HID: trivial formatting fixAlan Ott2010-09-221-0/+1
| * | | | HID: fix A4Tech RP-649 horizontal scrollwheelLech Perczak2010-09-173-0/+4
| * | | | HID: debugfs: wake up reading tasks upon eventChase Douglas2010-09-081-0/+2
| * | | | HID: sony: Apply sixaxis quirks only to sixaxisAntonio Ospite2010-09-021-14/+14
| * | | | HID: Kconfig: Complete Kconfig prompt namesBorislav Petkov2010-08-251-30/+30
| | |_|/ | |/| |
* | | | Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2010-10-232-2/+2
|\ \ \ \
| * | | | block: fix use-after-free bug in blk throttle codeJens Axboe2010-10-232-2/+2
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-10-231341-83259/+156508
|\ \ \ \ \
| * | | | | bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.Jesse Gross2010-10-222-2/+2
| * | | | | vlan: Calling vlan_hwaccel_do_receive() is always valid.Jesse Gross2010-10-221-1/+2
| * | | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-10-21192-757/+1302
| |\ \ \ \ \
| | * | | | | Revert d88dca79d3852a3623f606f781e013d61486828aNeil Horman2010-10-212-22/+37
| | * | | | | Revert c6537d6742985da1fbf12ae26cde6a096fd35b5cNeil Horman2010-10-212-22/+23
| | * | | | | net/core: Allow tagged VLAN packets to flow through VETH devices.Ben Greear2010-10-211-1/+1
| | * | | | | Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst...David S. Miller2010-10-211-1/+1
| | |\ \ \ \ \
| | | * | | | | vhost: fix return code for log_access_ok()Dan Carpenter2010-10-121-1/+1
| | * | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padova...David S. Miller2010-10-211-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | Bluetooth: fix oops in l2cap_connect_reqNathan Holstein2010-10-181-2/+2
| | * | | | | | | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/David S. Miller2010-10-21178-680/+1184
| | |\ \ \ \ \ \ \