summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-05-2329-1351/+755
|\
| *---. Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-...Jiri Kosina2011-05-236300-86086/+197511
| |\ \ \
| | | | * HID: magicmouse: ignore 'ivalid report id' while switching modesJiri Kosina2011-05-201-1/+9
| | | | * HID: fix a crash in hid_report_raw_event() function.Armando Visconti2011-05-201-0/+3
| | | | * HID: add support for Logitech G27 wheelPeter Gundermann2011-05-034-0/+7
| | | | * HID: hiddev: fix error path in hiddev_read when interruptedPeter Waechtler2011-04-291-1/+3
| | | | * HID: add support for Sony Navigation ControllerJiri Kosina2011-04-283-0/+4
| | | | * HID: add support for barcode scanners from Symbol TechnologiesJiri Kosina2011-04-262-0/+6
| | | * | HID: hiddev: fix race between hiddev_disconnect and hiddev_releaseJiri Kosina2011-05-201-2/+8
| | | * | HID: assorted usage updates from hut 1.12Jarod Wilson2011-05-181-8/+52
| | | * | Merge branch 'master' into upstream.Jiri Kosina2011-05-186286-84736/+197070
| | | |\ \
| | | * | | HID: roccat: fix actual/startup profile sysfs attribute in koneplusStefan Achatz2011-05-184-57/+65
| | | * | | HID: 'name' and 'phys' in 'struct hid_device' can never be NULLDaniel Mack2011-05-182-28/+4
| | | * | | HID: picolcd: Avoid compile warning/error triggered by copy_from_user()Bruno Prémont2011-05-051-2/+2
| | | * | | HID: bt: hidp.h: do not use a tab after a #defineAntonio Ospite2011-04-211-1/+1
| | | * | | HID: hidraw: fix commentsJiri Kosina2011-03-271-8/+8
| | | * | | HID: hiddev: fix brace indentDan Carpenter2011-03-271-1/+1
| | | | |/ | | | |/|
| | * | | HID: hid-multitouch: cosmetic changes, sort classes and devicesBenjamin Tissoires2011-05-232-48/+54
| | * | | HID: hid-multitouch: class MT_CLS_STANTUM is redundant with MT_CLS_CONFIDENCEBenjamin Tissoires2011-05-201-6/+3
| | * | | HID: hid-multitouch: add support for Unitec panelsBenjamin Tissoires2011-05-204-0/+15
| | * | | HID: hid-multitouch: add support for Touch International panelsBenjamin Tissoires2011-05-204-0/+10
| | * | | HID: hid-multitouch: add support for GoodTouch panelsBenjamin Tissoires2011-05-204-0/+10
| | * | | HID: hid-multitouch: add support for CVTouch panelsBenjamin Tissoires2011-05-204-0/+10
| | * | | HID: hid-multitouch: add support for ActionStar panelsBenjamin Tissoires2011-05-204-0/+10
| | * | | HID: hid-multitouch: add support for Elo TouchSystems 2515 IntelliTouch PlusBenjamin Tissoires2011-05-194-0/+13
| | * | | HID: hid-multitouch: Add support for Lumio panelsBenjamin Tissoires2011-05-184-0/+10
| | * | | HID: hid-multitouch: add support for Ilitek dual-touch panelAustin Zhang2011-05-094-0/+10
| | * | | HID: hid-multitouch: merge hid-mosart into hid-multitouchBenjamin Tissoires2011-04-224-304/+20
| | * | | HID: hid-multitouch: add support for PenMount dual-touch panelJohn Sung2011-04-224-0/+13
| | * | | HID: hid-multitouch: refactor last_field_indexBenjamin Tissoires2011-04-221-12/+11
| | * | | HID: hid-multitouch: migrate 3M PCT touch screens to hid-multitouchBenjamin Tissoires2011-03-244-314/+46
| | * | | HID: hid-multitouch: refactor initialization of ABS_MT_ORIENTATIONBenjamin Tissoires2011-03-211-3/+2
| | * | | HID: hid-multitouch: migrate Cando dual touch panels to hid-multitouchBenjamin Tissoires2011-03-214-283/+15
| | * | | HID: hid-multitouch: migrate support for Stantum panels to the unified driver.Benjamin Tissoires2011-03-214-293/+16
| | * | | HID: hid-multitouch: Auto detection of maxcontactsBenjamin Tissoires2011-03-211-15/+37
| | |/ /
| * | | HID: hid-example: fix some build issuesRandy Dunlap2011-04-212-2/+4
| * | | HID: hidraw: fix samples miscompilationJiri Kosina2011-04-091-0/+11
| * | | HID: Move hiddev.txt to the new Documentation/hid directoryAlan Ott2011-03-221-0/+0
| * | | HID: Documentation for hidrawAlan Ott2011-03-225-1/+301
| |/ /
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-05-232-7/+3
|\ \ \
| * | | apm-emulation: apm_mutex breaks ACK; remove itPaul Parsons2011-05-231-5/+0
| * | | APM: take over maintainershipJiri Kosina2011-05-041-2/+3
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw...Linus Torvalds2011-05-23185-10516/+24459
|\ \ \ \
| * \ \ \ Merge branch 'topic/hda' into for-linusTakashi Iwai2011-05-2215-3276/+4107
| |\ \ \ \
| | * | | | ALSA: hda - Use LPIB for ATI/AMD chipsets as defaultTakashi Iwai2011-05-201-1/+8
| | * | | | Revert "ALSA: hda - Use position_fix=3 as default for AMD chipsets"Takashi Iwai2011-05-201-5/+0
| | * | | | ALSA: hda - add Intel Panther Point HDMI codec idWu Fengguang2011-05-201-0/+2
| | * | | | ALSA: hda - Remove PCM mixer elements from Virtual Master of realtekRaymond Yau2011-05-201-2/+0
| | * | | | ALSA: hda - Fix input-src parse in patch_analog.cAdrian Wilkins2011-05-201-1/+2
| | * | | | ALSA: hda - Enable Realtek ALC269 codec input layer beepMadis Janson2011-05-191-0/+1