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-23T22:44:25Z 2011-02-23T22:44:25Z Linus Torvalds torvalds@linux-foundation.org 2011-02-23T22:44:25Z urn:sha1:57949e8006de9643ac95447143e0211be3ff5f81 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: serio/gameport - use 'long' system workqueue Input: synaptics - document 0x0c query Input: tegra-kbc - add function keymap 2011-02-23T16:53:01Z Dmitry Torokhov dmitry.torokhov@gmail.com 2011-02-23T04:15:07Z urn:sha1:9bb794ae0509f39abad6593793ec86d490bad31b Since Synaptics technical writers department is a bit slow releasing updated Synaptics interface guide, let's add some new bits (with their blessing) to the code so that they don't get lost. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 2011-01-31T03:02:34Z Linus Torvalds torvalds@linux-foundation.org 2011-01-31T03:02:34Z urn:sha1:1ca05b7fc2672ea870bd58f45dc8d36d2b980f94 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: synaptics - retry failed resets when reconnecting Input: synaptics - fix reconnect logic on MT devices Input: tegra-kbc - fix keymap entry for LeftMeta key Input: tegra-kbc - fix build error 2011-01-29T06:32:07Z Alexandre Peixoto Ferreira alexandref75@gmail.com 2011-01-29T06:05:14Z urn:sha1:c63fe0a41fd2374be0ebe93c053820a0eed9cefe On some machines, like Dell Studio XPS 16 (1640), touchpad fails to respond to the standard query after first reset but may start responding later, so let's repeat reset sequence several (3) times. Signed-off-by: Alexandre Peixoto Ferreira <alexandref75@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 2011-01-29T06:32:03Z Alexandre Peixoto Ferreira alexandref75@gmail.com 2011-01-29T06:05:14Z urn:sha1:baddf58963241307b29e027a9fb28dfe55939db8 synaptics_set_advanced_gesture_mode() affect capabilities bits we should perform comparison after calling this function, otherwise they will never match and we will be forced to perform full reconnect. Signed-off-by: Alexandre Peixoto Ferreira <alexandref75@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 2011-01-21T01:02:05Z David Rientjes rientjes@google.com 2011-01-20T22:44:16Z urn:sha1:6a108a14fa356ef607be308b68337939e56ea94e The meaning of CONFIG_EMBEDDED has long since been obsoleted; the option is used to configure any non-standard kernel with a much larger scope than only small devices. This patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes references to the option throughout the kernel. A new CONFIG_EMBEDDED option is added that automatically selects CONFIG_EXPERT when enabled and can be used in the future to isolate options that should only be considered for embedded systems (RISC architectures, SLOB, etc). Calling the option "EXPERT" more accurately represents its intention: only expert users who understand the impact of the configuration changes they are making should enable it. Reviewed-by: Ingo Molnar <mingo@elte.hu> Acked-by: David Woodhouse <david.woodhouse@intel.com> Signed-off-by: David Rientjes <rientjes@google.com> Cc: Greg KH <gregkh@suse.de> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jens Axboe <axboe@kernel.dk> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Robin Holt <holt@sgi.com> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 2011-01-10T16:15:37Z Linus Torvalds torvalds@linux-foundation.org 2011-01-10T16:15:37Z urn:sha1:facc7a96d443d84060a8679c3fcc51d20d4981c3 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (34 commits) HID: roccat: Update sysfs attribute doc HID: roccat: don't use #pragma pack HID: roccat: Add support for Roccat Kone[+] v2 HID: roccat: reduce number of functions in kone and pyra drivers HID: roccat: declare meaning of pack pragma usage in driver headers HID: roccat: use class for char device for sysfs attribute creation sysfs: Introducing binary attributes for struct class HID: hidraw: add compatibility ioctl() for 32-bit applications. HID: hid-picolcd: Fix memory leak in picolcd_debug_out_report() HID: picolcd: fix misuse of logical operation in place of bitop HID: usbhid: base runtime PM on modern API HID: replace offsets values with their corresponding BTN_* defines HID: hid-mosart: support suspend/resume HID: hid-mosart: ignore buttons report HID: hid-picolcd: don't use flush_scheduled_work() HID: simplify an index check in hid_lookup_collection HID: Hoist assigns from ifs HID: Remove superfluous __inline__ HID: Use vzalloc for vmalloc/memset(,0...) HID: Add and use hid_<level>: dev_<level> equivalents ... 2011-01-07T06:34:59Z Dmitry Torokhov dmitry.torokhov@gmail.com 2011-01-07T06:34:59Z urn:sha1:554738da71004d96e06fb75f4772dfc3b0f47810 Conflicts: include/linux/input.h 2010-12-28T01:33:20Z Dmitry Torokhov dmitry.torokhov@gmail.com 2010-12-28T01:33:20Z urn:sha1:5c461b913a16aed8afa285a1d00414791a9afe33 2010-12-23T09:21:23Z Andres Salomon dilinger@queued.net 2010-12-23T09:19:38Z urn:sha1:ef8313bb1a22e7d2125d9d758aa8a81f1de91d81 OLPC has switched to a Synaptics touchpad. It turns out that it's pretty useless in absolute mode. This patch looks for an OLPC system (via DMI tables), and refuses to init Synaptics mode in that scenario (falling back to relative mode). Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>