LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	linux-kernel@vger.kernel.org, linux-input@vger.kernel.org
Subject: [git pull] Input updates for 2.6.37-rc0
Date: Thu, 6 Jan 2011 22:54:48 -0800	[thread overview]
Message-ID: <20110107065448.GC29038@core.coreip.homeip.net> (raw)

Hi Linus,

Please pull from:

	git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git for-linus
or
	master.kernel.org:/pub/scm/linux/kernel/git/dtor/input.git for-linus

to receive first round of updates for the input subsystem.

As an exception, a few HID drivers are coming through my tree instead of
Jiri's in this merge window, because they depend on MT protocol changes.

There will be a conflict in drivers/input/keyboard/Kconfig due to
tc3589x keypad driver coming from ux500 tree and clashing with SPEAR
keypad driver. If you could resolve by having SPEAR entry first and
tc3589x next to it that would be great, otherwise I can pull your tree
and resolve conflict myself.

Thanks!

Changelog:
---------

Ajay Ramaswamy (1):
      Input: wacom - add support for digitizer in Lenovo W700

Andres Salomon (2):
      Input: psmouse - fix up Synaptics comment
      Input: psmouse - disable the synaptics extension on OLPC machines

Andy Ross (1):
      hid: egalax: Add support for Wetab (726b)

Axel Lin (7):
      Input: xpad - return proper error in error path
      Input: xpad - fix a memory leak
      Input: xpad - fix resource reclaim in xpad_probe error path
      Input: xpad - ensure xpad->bulk_out is initialized before submitting urb
      Input: ps2mult - fix wrong kfree in ps2mult_connect error path
      Input: ams_delta_serio - fix wrong kfree in ams_delta_serio_exit
      Input: ct82c710 - remove a redundant serio_register_port()

Chris Leech (1):
      Input: qt602240_ts - fix wrong sizeof in object table allocation

Daniel Drake (5):
      Input: hgpk - support GlideSensor and PenTablet modes
      Input: hgpk - rework spew detection
      Input: hgpk - extend jumpiness detection
      Input: hgpk - detect simple mode overflows
      Input: hgpk - recalibration tweaks

David Sterba (1):
      Input: bu21013_ts - fix misuse of logical operation in place of bitop

Dmitry Torokhov (10):
      Input: xpad - remove useless check in xpad_remove
      Input: pcf_keypad - convert to dev_op_ops
      Input: mac mouse emulation - add locking
      Input: qt602240_ts - convert to using dev_pm_ops
      Input: serio - convert to common workqueue instead of a thread
      Input: gameport - convert to use common workqueue instead of a thread
      Input: clean up Makefile (use input-core-y)
      Input: iforce - clean up Makefile
      Input: cma3000_d0x_i2c - add MODULE_DEVICE_TABLE
      Input: include MT library as source for kerneldoc

Hemanth V (1):
      Input: add CMA3000 accelerometer driver

Henrik Rydberg (18):
      input: mt: Break out slots handling
      input: mt: Collect slots initialization code
      input: mt: Move tracking and pointer emulation to input-mt
      input: mt: Add hovering distance axis
      hid: egalax: Setup input device manually
      hid: egalax: Correct for device resolution report error
      hid: egalax: Report zero as minimum pressure
      hid: egalax: Add event filtering
      hid: egalax: Convert to MT slots
      hid: egalax: Add support for Wetab
      hid: egalax: Document the new devices in Kconfig
      MAINTAINERS: Update input-mt entry
      Input: introduce device properties
      Input: fix double equality sign in uevent
      input: mt: Document interface updates
      Input: synaptics - report clickpad property
      Input: synaptics - add multi-finger and semi-mt support
      Input: synaptics - ignore bogus mt packet

Jesper Juhl (1):
      Input: serio HIL MLC - don't deref null, don't leak and return proper error

Joe Perches (2):
      Input: i8042 - use pr_<level>, pr_fmt, fix dbg and __FILE__ use
      Input: use pr_fmt and pr_<level>

Pali Rohár (1):
      Input: i8042 - add Acer Aspire 5100 to the Dritek list

Paul Fox (1):
      Input: hgpk - fix powersave mode

Ping Cheng (2):
      Input: wacom_w8001 - use __set_bit to set keybits
      Input: wacom_w8001 - support pen or touch only devices

Rajeev Kumar (1):
      Input: add support for keyboards on ST SPEAr platform

Richard Nauber (1):
      hid: egalax: Add support for Samsung NB30 netbook

Tony SIM (2):
      Input: tca6416-keypad - add support for tca6408a
      Input: add ST1232 touchscreen controller driver


Diffstat:
--------

 Documentation/DocBook/device-drivers.tmpl    |    4 +
 Documentation/input/cma3000_d0x.txt          |  115 +++++
 Documentation/input/multi-touch-protocol.txt |   53 ++-
 MAINTAINERS                                  |    2 +
 arch/arm/plat-spear/include/plat/keyboard.h  |  141 ++++++
 drivers/hid/Kconfig                          |    3 +-
 drivers/hid/hid-3m-pct.c                     |   36 +--
 drivers/hid/hid-core.c                       |    3 +
 drivers/hid/hid-egalax.c                     |  131 +++---
 drivers/hid/hid-ids.h                        |    3 +
 drivers/input/Makefile                       |    2 +-
 drivers/input/apm-power.c                    |   14 +-
 drivers/input/evbug.c                        |   18 +-
 drivers/input/evdev.c                        |   19 +-
 drivers/input/ff-core.c                      |   11 +-
 drivers/input/ff-memless.c                   |   31 +-
 drivers/input/gameport/gameport.c            |  152 +++---
 drivers/input/input-mt.c                     |  170 +++++++
 drivers/input/input-polldev.c                |    5 +-
 drivers/input/input.c                        |   91 ++---
 drivers/input/joydev.c                       |    4 +-
 drivers/input/joystick/iforce/Makefile       |   15 +-
 drivers/input/joystick/xpad.c                |  123 +++--
 drivers/input/keyboard/Kconfig               |   19 +-
 drivers/input/keyboard/Makefile              |    1 +
 drivers/input/keyboard/spear-keyboard.c      |  344 +++++++++++++
 drivers/input/keyboard/tca6416-keypad.c      |   13 +-
 drivers/input/misc/Kconfig                   |   24 +
 drivers/input/misc/Makefile                  |    2 +
 drivers/input/misc/cma3000_d0x.c             |  398 +++++++++++++++
 drivers/input/misc/cma3000_d0x.h             |   42 ++
 drivers/input/misc/cma3000_d0x_i2c.c         |  143 ++++++
 drivers/input/misc/pcf8574_keypad.c          |   19 +-
 drivers/input/misc/uinput.c                  |    8 +-
 drivers/input/mouse/hgpk.c                   |  695 +++++++++++++++++++++++---
 drivers/input/mouse/hgpk.h                   |   31 ++-
 drivers/input/mouse/psmouse-base.c           |    1 +
 drivers/input/mouse/synaptics.c              |  129 +++++-
 drivers/input/mouse/synaptics.h              |    3 +
 drivers/input/mousedev.c                     |   10 +-
 drivers/input/serio/ams_delta_serio.c        |    1 -
 drivers/input/serio/ct82c710.c               |    8 +-
 drivers/input/serio/hil_mlc.c                |    5 +
 drivers/input/serio/hp_sdc_mlc.c             |   18 +-
 drivers/input/serio/i8042-x86ia64io.h        |   37 +-
 drivers/input/serio/i8042.c                  |   92 ++--
 drivers/input/serio/i8042.h                  |   14 +-
 drivers/input/serio/ps2mult.c                |    2 +-
 drivers/input/serio/serio.c                  |  155 +++----
 drivers/input/tablet/wacom.h                 |    1 +
 drivers/input/tablet/wacom_wac.c             |   33 +-
 drivers/input/tablet/wacom_wac.h             |    4 -
 drivers/input/touchscreen/Kconfig            |   22 +-
 drivers/input/touchscreen/Makefile           |    1 +
 drivers/input/touchscreen/bu21013_ts.c       |    2 +-
 drivers/input/touchscreen/qt602240_ts.c      |   21 +-
 drivers/input/touchscreen/st1232.c           |  274 ++++++++++
 drivers/input/touchscreen/wacom_w8001.c      |   71 ++--
 drivers/input/xen-kbdfront.c                 |   10 +-
 drivers/macintosh/mac_hid.c                  |    8 +
 include/linux/input.h                        |   38 +-
 include/linux/input/cma3000.h                |   59 +++
 include/linux/input/mt.h                     |   57 +++
 include/linux/uinput.h                       |    1 +
 64 files changed, 3209 insertions(+), 753 deletions(-)
 create mode 100644 Documentation/input/cma3000_d0x.txt
 create mode 100644 arch/arm/plat-spear/include/plat/keyboard.h
 create mode 100644 drivers/input/input-mt.c
 create mode 100644 drivers/input/keyboard/spear-keyboard.c
 create mode 100644 drivers/input/misc/cma3000_d0x.c
 create mode 100644 drivers/input/misc/cma3000_d0x.h
 create mode 100644 drivers/input/misc/cma3000_d0x_i2c.c
 create mode 100644 drivers/input/touchscreen/st1232.c
 create mode 100644 include/linux/input/cma3000.h
 create mode 100644 include/linux/input/mt.h

-- 
Dmitry


             reply	other threads:[~2011-01-07  6:54 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-07  6:54 Dmitry Torokhov [this message]
2011-01-07  6:56 ` [git pull] Input updates for 2.6.38-rc0 Dmitry Torokhov
2011-01-12  6:09 ` [git pull] Input updates for 2.6.38-rc0 (round 2) Dmitry Torokhov
2011-01-26  4:57 ` [git pull] Input updates for 2.6.38-rc2 Dmitry Torokhov
2011-01-29  7:23 ` Dmitry Torokhov
2011-02-15 16:41 ` [git pull] Input updates for 2.6.38-rc4 Dmitry Torokhov
2011-02-23 16:59 ` [git pull] Input updates for 2.6.38-rc6 Dmitry Torokhov
  -- strict thread matches above, loose matches on Subject: below --
2010-10-31 15:28 [git pull] Input updates for 2.6.37-rc0 Dmitry Torokhov
2010-10-25  5:17 Dmitry Torokhov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110107065448.GC29038@core.coreip.homeip.net \
    --to=dmitry.torokhov@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --subject='Re: [git pull] Input updates for 2.6.37-rc0' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).