Mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/ https://git.shady.money/linux/atom?h=v2.6.38 2011-02-15T17:40:27Z 2011-02-15T17:40:27Z Linus Torvalds torvalds@linux-foundation.org 2011-02-15T17:40:27Z urn:sha1:87450bd55d6f7caa472b5db49a97ca373baf2577 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: matrix_keypad - increase the limit of rows and columns Input: wacom - fix error path in wacom_probe() Input: ads7846 - check proper condition when freeing gpio Revert "Input: do not pass injected events back to the originating handler" Input: sysrq - rework re-inject logic Input: serio - clear pending rescans after sysfs driver rebind Input: rotary_encoder - use proper irqflags Input: wacom_w8001 - report resolution to userland 2011-02-06T15:49:48Z Ben Hutchings ben@decadent.org.uk 2010-12-11T20:17:54Z urn:sha1:e66a022a80d73b1a5d2e02c9db2c42e8b9853b40 FREQ is a ridiculously short name for a platform-specific macro in a generic header, and it now conflicts with an enumeration in the gspca/ov519 driver. Also delete conditional reference to ixp4xx_get_board_tick_rate() which is not defined anywhere. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl> 2011-02-03T07:01:00Z Alexander Stein alexander.stein@informatik.tu-chemnitz.de 2011-02-03T06:59:54Z urn:sha1:e0d5f4c31d4769b8574dfd8c61a1f753f7cfbc2f IORESOURCE_IRQ_* is wrong for irq_request, use the correct IRQF_* instead. Signed-off-by: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 2011-01-07T22:45:47Z Linus Torvalds torvalds@linux-foundation.org 2011-01-07T22:45:47Z urn:sha1:31b6ca0af758a88e5e769b48cc6dde037ee37b96 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (58 commits) Input: wacom_w8001 - support pen or touch only devices Input: wacom_w8001 - use __set_bit to set keybits Input: bu21013_ts - fix misuse of logical operation in place of bitop Input: i8042 - add Acer Aspire 5100 to the Dritek list Input: wacom - add support for digitizer in Lenovo W700 Input: psmouse - disable the synaptics extension on OLPC machines Input: psmouse - fix up Synaptics comment Input: synaptics - ignore bogus mt packet Input: synaptics - add multi-finger and semi-mt support Input: synaptics - report clickpad property input: mt: Document interface updates Input: fix double equality sign in uevent Input: introduce device properties hid: egalax: Add support for Wetab (726b) Input: include MT library as source for kerneldoc MAINTAINERS: Update input-mt entry hid: egalax: Add support for Samsung NB30 netbook hid: egalax: Document the new devices in Kconfig hid: egalax: Add support for Wetab hid: egalax: Convert to MT slots ... Fixed up trivial conflict in drivers/input/keyboard/Kconfig 2010-12-29T10:16:38Z David Härdeman david@hardeman.nu 2010-10-29T19:08:28Z urn:sha1:5b2e303f6df1e0b1a903950c5d613a20c8c71a37 Move winbond-cir from drivers/input/misc/ into drivers/media/rc/ and convert it to use rc-core. Signed-off-by: David Härdeman <david@hardeman.nu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> 2010-12-28T01:33:20Z Dmitry Torokhov dmitry.torokhov@gmail.com 2010-12-28T01:33:20Z urn:sha1:5c461b913a16aed8afa285a1d00414791a9afe33 2010-12-20T08:37:33Z Henrik Rydberg rydberg@euromail.se 2010-12-18T19:51:13Z urn:sha1:85b7720039fc000b561c20fe2aaa3b54cddae4a7 Today, userspace sets up an input device based on the data it emits. This is not always enough; a tablet and a touchscreen may emit exactly the same data, for instance, but the former should be set up with a pointer whereas the latter does not need to. Recently, a new type of touchpad has emerged where the buttons are under the pad, which changes logic without changing the emitted data. This patch introduces a new ioctl, EVIOCGPROP, which enables user access to a set of device properties useful during setup. The properties are given as a bitmap in the same fashion as the event types, and are also made available via sysfs, uevent and /proc/bus/input/devices. Acked-by: Ping Cheng <pingc@wacom.com> Acked-by: Chase Douglas <chase.douglas@canonical.com> Acked-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Henrik Rydberg <rydberg@euromail.se> 2010-12-16T17:17:48Z Dmitry Torokhov dmitry.torokhov@gmail.com 2010-12-16T17:17:48Z urn:sha1:67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb Conflicts: drivers/input/Makefile 2010-12-16T09:41:12Z Henrik Rydberg rydberg@euromail.se 2010-11-27T09:50:54Z urn:sha1:8cde81001626c4c60b26ef2eb5fc522885ed9fd0 The MT slots devices all follow the same initialization pattern of creating slots and hinting about buffer size. Let drivers call an initialization function instead, and make sure it can be called repeatedly without side effects. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> 2010-12-16T09:39:57Z Henrik Rydberg rydberg@euromail.se 2010-11-27T08:16:48Z urn:sha1:47c78e891323513e9909729b44033e2c6649e2b7 In preparation for common code to handle a larger set of MT slots devices, move the slots handling over to a separate file. Signed-off-by: Henrik Rydberg <rydberg@euromail.se>