summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' into for-linusJiri Kosina2012-03-2015-1084/+860
|\
| * HID: multitouch: add PID for Fructel productAndreas Nielsen2012-03-203-0/+9
| * HID: tivo: add support for BT-version (0x1200)Jiri Kosina2012-03-134-1/+4
| * HID: make it possible to force hid-core claim the deviceJiri Kosina2012-03-091-2/+6
| * HID: waltop: Add support for tablet with PID 0038Nikolai Kondrashov2012-03-063-0/+150
| * HID: waltop: Replace original rdescs with linksNikolai Kondrashov2012-03-061-788/+15
| * HID: uclogic: Replace original rdescs with linksNikolai Kondrashov2012-03-061-402/+11
| * HID: kye: Add support for 3 tabletsNikolai Kondrashov2012-02-285-20/+396
| * HID: correct PID for saitek PS1000Jiri Kosina2012-02-221-1/+1
| * HID: add new driver for non-compliant Saitek devicesAndreas Hübner2012-02-225-0/+82
| * HID: use generic driver for Logitech Unifying receivers if !CONFIG_HID_LOGITE...Konstantin Khlebnikov2012-02-212-1/+5
| * HID: sjoy: Add device ID for Super Joy Box 3Sean Young2012-02-213-2/+6
| * HID: wacom: Force new name for Wacom Intuos4 WL PTK-540WLPrzemo Firszt2012-02-211-0/+1
| * HID: Add quirk for CH Products FighterstickVille Ranki2012-02-212-0/+2
| * HID: hid-magicmouse: Add pointer and buttonpad properties for Magic TrackpadChase Douglas2012-02-211-0/+2
| * HID: waltop: Add support for Waltop Q PadNikolai Kondrashov2012-02-073-0/+194
| * HID: tivo: fix broken buildJiri Kosina2012-02-061-1/+1
| * HID: add support for tivo slide remoteJarod Wilson2012-02-065-0/+100
| * HID: add more hotkeys in Asus AIO keyboardsKeng-Yu Lin2012-02-021-0/+2
| * HID: add extra hotkeys in Asus AIO keyboardsKeng-Yu Lin2012-02-023-0/+7
| |
| \
*-. \ Merge branches 'roccat' and 'wacom' into for-linusJiri Kosina2012-03-203-70/+90
|\ \ \
| | * | HID: wacom: Add reporting of wheel for Intuos4 WLPrzemo Firszt2012-03-161-0/+24
| | * | HID: wacom: Replace __set_bit with input_set_capabilityPrzemo Firszt2012-03-161-3/+1
| | * | HID: wacom: Reset stylus buttons - Intuos4 WLPrzemo Firszt2012-03-121-0/+2
| | * | HID: wacom: Add pad buttons reporting on Intuos4 WLPrzemo Firszt2012-03-011-1/+35
| | * | HID: wacom: report distance for Intuos4 WLPrzemo Firszt2012-03-011-0/+4
| | * | HID: wacom: Add serial and id reporting for Wacom Intuos4 WLPrzemo Firszt2012-02-271-6/+15
| | * | HID: wacom: set ABS_MISC bit for Intuos4 WLPrzemo Firszt2012-02-271-0/+1
| | * | HID: wacom: fix proximity tool releasePrzemo Firszt2012-02-211-1/+1
| * | | HID: roccat: Only one Kconfig entry for all roccat driversStefan Achatz2012-02-052-59/+7
| | | |
| \ \ \
| \ \ \
| \ \ \
*---. \ \ \ Merge branches 'battery-scope', 'logitech' and 'multitouch' into for-linusJiri Kosina2012-03-207-59/+204
|\ \ \ \ \ \
| | | * | | | HID: multitouch: detect serial protocolBenjamin Tissoires2012-03-121-0/+13
| | | * | | | HID: handle all multitouch devices through hid-multitouchBenjamin Tissoires2012-03-122-7/+16
| | | * | | | HID: multitouch: fix handling of buggy reports descriptors for Dell ST2220TBenjamin Tissoires2012-03-121-39/+25
| | | * | | | HID: multitouch: add support for eGalax 0x722aBenjamin Tissoires2012-03-092-0/+4
| | | * | | | HID: usbhid: add quirk no_get for quanta 3008 devicesBenjamin Tissoires2012-03-061-0/+1
| | | * | | | HID: multitouch: add more eGalax devicesBenjamin Tissoires2012-03-063-0/+26
| | | * | | | HID: multitouch: add new PID from IdeacomBenjamin Tissoires2012-03-062-0/+4
| | | * | | | HID: multitouch: add support for Atmel maXTouch 03eb:2118Benjamin Tissoires2012-03-062-0/+4
| | | * | | | HID: multitouch: add support of Panasonic multitouch panelsDenis Kovalev2012-02-214-5/+23
| | | * | | | HID: multitouch: support Perixx PERIPAD 701Benjamin Tissoires2012-02-063-0/+13
| | | * | | | HID: multitouch: add control of the feature "Maximum Contact Number"Benjamin Tissoires2012-02-061-0/+32
| | | * | | | HID: multitouch: add support for trackpadsBenjamin Tissoires2012-02-061-6/+34
| | | |/ / /
| | * | | | HID: logitech: fix mask to enable DJ modeNestor Lopez Casado2012-02-021-1/+1
| | | |_|/ | | |/| |
| * | | | HID: hid-input/battery: set scope and powered device for HID batteryJeremy Fitzhardinge2012-02-031-1/+8
| | |/ / | |/| |
* | | | Merge tag 'mmc-fixes-for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2012-03-059-25/+38
|\ \ \ \
| * | | | mmc: core: Fixup suspend/resume issues for UHS-I cardsUlf Hansson2012-03-044-5/+17
| * | | | mmc: mmci: reduce max_blk_count to avoid overflowing max_req_sizeWill Deacon2012-03-041-3/+4
| * | | | mmc: sdhci-esdhc-imx: fix for mmc cards on i.MX5Sascha Hauer2012-03-041-2/+3
| * | | | mmc: core: fix regression: set default clock gating delay to 0Guennadi Liakhovetski2012-03-041-2/+2