diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-20 11:00:43 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-20 11:00:43 -0800 |
commit | c6699b58f4fe2f968f036a862c09ce44b6968376 (patch) | |
tree | d26743fa88966c2bdfd35ba723e3631f08a1f5fc /drivers/clk/clk-max77686.c | |
parent | 5a1203914a637b642442a861cf462d16401548e1 (diff) | |
parent | 2d9f0d964be94fd51c7303288c6f9c88bf2381fe (diff) | |
download | linux-3.10-c6699b58f4fe2f968f036a862c09ce44b6968376.tar.gz linux-3.10-c6699b58f4fe2f968f036a862c09ce44b6968376.tar.bz2 linux-3.10-c6699b58f4fe2f968f036a862c09ce44b6968376.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"Two new touchpad drivers - Cypress APA I2C Trackpad and Cypress PS/2
touchpad and a big update to ALPS driver from Kevin Cernekee that adds
support for "Rushmore" touchpads and paves way for adding support for
"Dolphin" touchpads.
There is also a new input driver for Goldfish emulator and also
Android keyreset driver was folded into SysRq code.
A few more drivers were updated with device tree bindings and others
got some small cleanups and fixes."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (55 commits)
Input: cyttsp-spi - remove duplicate MODULE_ALIAS()
Input: tsc2005 - add MODULE_ALIAS
Input: tegra-kbc - require CONFIG_OF, remove platform data
Input: synaptics - initialize pointer emulation usage
Input: MT - do not apply filtering on emulated events
Input: bma150 - make some defines public and fix some comments
Input: bma150 - fix checking pm_runtime_get_sync() return value
Input: ALPS - enable trackstick on Rushmore touchpads
Input: ALPS - add support for "Rushmore" touchpads
Input: ALPS - make the V3 packet field decoder "pluggable"
Input: ALPS - move pixel and bitmap info into alps_data struct
Input: ALPS - fix command mode check
Input: ALPS - rework detection of Pinnacle AGx touchpads
Input: ALPS - move {addr,nibble}_command settings into alps_set_defaults()
Input: ALPS - use function pointers for different protocol handlers
Input: ALPS - rework detection sequence
Input: ALPS - introduce helper function for repeated commands
Input: ALPS - move alps_get_model() down below hw_init code
Input: ALPS - copy "model" info into alps_data struct
Input: ALPS - document the alps.h data structures
...
Diffstat (limited to 'drivers/clk/clk-max77686.c')
0 files changed, 0 insertions, 0 deletions