Mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/ https://git.shady.money/linux/atom?h=v3.12 2013-09-13T13:09:52Z 2013-09-13T13:09:52Z Martin Schwidefsky schwidefsky@de.ibm.com 2013-08-30T07:39:53Z urn:sha1:0244ad004a54e39308d495fee0a2e637f8b5c317 After the last architecture switched to generic hard irqs the config options HAVE_GENERIC_HARDIRQS & GENERIC_HARDIRQS and the related code for !CONFIG_GENERIC_HARDIRQS can be removed. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> 2013-09-07T17:38:46Z Linus Torvalds torvalds@linux-foundation.org 2013-09-07T17:38:46Z urn:sha1:8b8a7df9a1d87ba413fce246b11f54c636bb456a Pull input updates from Dmitry Torokhov: "A new driver for slidebar on Ideapad laptops and a bunch of assorted driver fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (32 commits) Input: add SYN_MAX and SYN_CNT constants Input: max11801_ts - convert to devm Input: egalax-ts - fix typo and improve text Input: MAINTAINERS - change maintainer for cyttsp driver Input: cyttsp4 - kill 'defined but not used' compiler warnings Input: add driver for slidebar on Lenovo IdeaPad laptops Input: omap-keypad - set up irq type from DT Input: omap-keypad - enable wakeup capability for keypad. Input: omap-keypad - clear interrupts on open Input: omap-keypad - convert to threaded IRQ Input: omap-keypad - use bitfiled instead of hardcoded values Input: cyttsp4 - remove useless NULL test from cyttsp4_watchdog_timer() Input: wacom - fix error return code in wacom_probe() Input: as5011 - fix error return code in as5011_probe() Input: keyboard, serio - simplify use of devm_ioremap_resource Input: tegra-kbc - simplify use of devm_ioremap_resource Input: htcpen - fix incorrect placement of __initdata Input: qt1070 - add power management ops Input: wistron_btns - add MODULE_DEVICE_TABLE Input: wistron_btns - mark the Medion MD96500 keymap as tested ... 2013-09-07T03:23:44Z Dmitry Torokhov dmitry.torokhov@gmail.com 2013-09-07T03:23:44Z urn:sha1:07176b988ebb20f46a317a60ee1d983fe1630203 Merge first round of changes for 3.12 merge window. 2013-08-29T16:34:48Z Fabio Estevam fabio.estevam@freescale.com 2013-08-29T16:13:35Z urn:sha1:d33c4aa32d426a7c00d33b5b1212720d5bc3fa44 Converting to devm functions can make the code smaller and cleaner. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-08-29T15:45:15Z Geert Uytterhoeven geert@linux-m68k.org 2013-08-29T15:40:42Z urn:sha1:ca0abe3d89fd95b80654e3429d84e4aad567a395 If both CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME are unset: drivers/input/touchscreen/cyttsp4_core.c:1556: warning: ‘cyttsp4_core_sleep’ defined but not used drivers/input/touchscreen/cyttsp4_core.c:1634: warning: ‘cyttsp4_core_wake’ defined but not used Move cyttsp4_core_sleep(), cyttsp4_core_wake(), and cyttsp4_core_wake_() (which is called from cyttsp4_core_wake() only) inside the existing section protected by #if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_RUNTIME) Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-08-26T07:15:05Z Wei Yongjun yongjun_wei@trendmicro.com.cn 2013-08-26T06:24:35Z urn:sha1:e87ca42464b9ec2946ed5a4a921f292834bb494f Remove useless NULL test from cyttsp4_watchdog_timer(). Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Ferruh Yigit <fery@cypress.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-08-15T07:30:04Z Sachin Kamat sachin.kamat@linaro.org 2013-08-15T06:50:48Z urn:sha1:f01868dcb13e7eb064910e8afe391c1846b9e73b __initdata should be placed between the variable name and equal sign for the variable to be placed in the intended section. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Cc: Pau Oliva Fora <pau@eslack.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-08-13T05:32:23Z Jingoo Han jg1.han@samsung.com 2013-08-05T16:06:00Z urn:sha1:54e9f4501079c837bbcc535c8de5a2e2fcbf6782 Add CONFIG_PM_SLEEP to suspend/resume functions to fix the build warnings when CONFIG_PM_SLEEP is not selected. This is because sleep PM callbacks defined by SET_SYSTEM_SLEEP_PM_OPS are only used when the CONFIG_PM_SLEEP is enabled. drivers/input/touchscreen/eeti_ts.c:268:12: warning: 'eeti_ts_suspend' defined but not used [-Wunused-function] drivers/input/touchscreen/eeti_ts.c:287:12: warning: 'eeti_ts_resume' defined but not used [-Wunused-function] Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-08-13T05:32:18Z Jingoo Han jg1.han@samsung.com 2013-08-05T16:04:23Z urn:sha1:04245e9fde5708ae5d44cece1e3d7b64f3f62513 Add CONFIG_PM_SLEEP to suspend/resume functions to fix the build warnings when CONFIG_PM_SLEEP is not selected. This is because sleep PM callbacks defined by SET_SYSTEM_SLEEP_PM_OPS are only used when the CONFIG_PM_SLEEP is enabled. drivers/input/touchscreen/cy8ctmg110_ts.c:295:12: warning: 'cy8ctmg110_suspend' defined but not used [-Wunused-function] drivers/input/touchscreen/cy8ctmg110_ts.c:309:12: warning: 'cy8ctmg110_resume' defined but not used [-Wunused-function] Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> 2013-07-14T01:05:13Z Linus Torvalds torvalds@linux-foundation.org 2013-07-14T01:05:13Z urn:sha1:18fb38e2f58ff7a66e30cbb71af81425edf1c9a1 Pull second round of input updates from Dmitry Torokhov: "An update to Elantech driver to support hardware v7, fix to the new cyttsp4 driver to use proper addressing, ads7846 device tree support and nspire-keypad got a small cleanup." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: nspire-keypad - replace magic offset with define Input: elantech - fix for newer hardware versions (v7) Input: cyttsp4 - use 16bit address for I2C/SPI communication Input: ads7846 - add device tree bindings Input: ads7846 - make sure we do not change platform data