1
linux/arch/arm
Linus Torvalds 7bfe0e66d5 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem updates from Dmitry Torokhov:
 "- we finally merged driver for USB version of Synaptics touchpads
    (I guess most commonly found in IBM/Lenovo keyboard/touchpad combo);

   - a bunch of new drivers for embedded platforms (Cypress
     touchscreens, DA9052 OnKey, MAX8997-haptic, Ilitek ILI210x
     touchscreens, TI touchscreen);

   - input core allows clients to specify desired clock source for
     timestamps on input events (EVIOCSCLOCKID ioctl);

   - input core allows querying state of all MT slots for given event
     code via EVIOCGMTSLOTS ioctl;

   - various driver fixes and improvements."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (45 commits)
  Input: ili210x - add support for Ilitek ILI210x based touchscreens
  Input: altera_ps2 - use of_match_ptr()
  Input: synaptics_usb - switch to module_usb_driver()
  Input: convert I2C drivers to use module_i2c_driver()
  Input: convert SPI drivers to use module_spi_driver()
  Input: omap4-keypad - move platform_data to <linux/platform_data>
  Input: kxtj9 - who_am_i check value and initial data rate fixes
  Input: add driver support for MAX8997-haptic
  Input: tegra-kbc - revise device tree support
  Input: of_keymap - add device tree bindings for simple key matrices
  Input: wacom - fix physical size calculation for 3rd-gen Bamboo
  Input: twl4030-vibra - really switch from #if to #ifdef
  Input: hp680_ts_input - ensure arguments to request_irq and free_irq are compatible
  Input: max8925_onkey - avoid accessing input device too early
  Input: max8925_onkey - allow to be used as a wakeup source
  Input: atmel-wm97xx - convert to dev_pm_ops
  Input: atmel-wm97xx - set driver owner
  Input: add cyttsp touchscreen maintainer entry
  Input: cyttsp - remove useless checks in cyttsp_probe()
  Input: usbtouchscreen - add support for Data Modul EasyTouch TP 72037
  ...
2012-03-22 20:20:18 -07:00
..
boot Core device tree changes for Linux v3.4 2012-03-21 10:30:03 -07:00
common Generialize powerpc's irq_host as irq_domain 2012-03-21 10:27:19 -07:00
configs Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
include/asm Generialize powerpc's irq_host as irq_domain 2012-03-21 10:27:19 -07:00
kernel Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-03-20 10:31:44 -07:00
lib ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts 2012-01-25 11:07:40 +00:00
mach-at91 ARM: at91/dma: DMA controller registering with DT support 2012-02-29 18:20:39 +01:00
mach-bcmring Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-03-20 21:12:50 -07:00
mach-clps711x
mach-cns3xxx
mach-davinci ARM: davinci: update mdio bus name 2012-01-27 22:29:09 +05:30
mach-dove ARM: orion: Fix USB phy for orion5x. 2012-02-09 16:16:35 -08:00
mach-ebsa110
mach-ep93xx Updates of sound stuff for 3.4-rc1 2012-03-22 13:00:13 -07:00
mach-exynos Generialize powerpc's irq_host as irq_domain 2012-03-21 10:27:19 -07:00
mach-footbridge
mach-gemini
mach-h720x
mach-highbank ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
mach-imx Updates of sound stuff for 3.4-rc1 2012-03-22 13:00:13 -07:00
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-ixp23xx
mach-ixp2000
mach-kirkwood Linux 3.3-rc4 2012-02-19 18:35:12 -08:00
mach-ks8695 ARM, KS8695: Only include linux/gpio.h once in arch/arm/mach-ks8695/leds.c 2012-02-10 09:52:18 +01:00
mach-l7200/include/mach
mach-lpc32xx ARM: LPC32xx: serial.c: Fixed loop limit 2012-02-27 17:28:03 +01:00
mach-mmp arch/arm/mach-mmp/: some files include some headers twice 2012-02-16 23:24:30 +08:00
mach-msm irq_domain: Remove irq_domain_add_simple() 2012-02-16 06:11:23 -07:00
mach-mv78xx0 ARM: orion: Fix USB phy for orion5x. 2012-02-09 16:16:35 -08:00
mach-mxs
mach-netx
mach-nomadik
mach-omap1 Updates of sound stuff for 3.4-rc1 2012-03-22 13:00:13 -07:00
mach-omap2 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2012-03-22 20:20:18 -07:00
mach-orion5x Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-03-20 21:12:50 -07:00
mach-picoxcell Merge branch 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji into fixes 2012-01-16 22:45:42 -08:00
mach-pnx4008
mach-prima2 irq_domain: Remove irq_domain_add_simple() 2012-02-16 06:11:23 -07:00
mach-pxa Merge 3.3-rc7 into usb-next 2012-03-12 09:13:31 -07:00
mach-realview ARM: 7298/1: realview: fix mapping of MPCore private memory region 2012-01-25 09:24:36 +00:00
mach-rpc
mach-s3c64xx Linux 3.3-rc4 2012-02-19 18:35:12 -08:00
mach-s3c2410 ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
mach-s3c2412 ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
mach-s3c2416 ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
mach-s3c2440 ARM: S3C2440: Fixed build error for s3c244x 2012-03-08 08:57:29 -08:00
mach-s3c2443 ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
mach-s5p64x0 ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
mach-s5pc100
mach-s5pv210 ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
mach-sa1100 Merge branch 'sa11x0-mcp-fixes' into fixes 2012-01-26 21:06:54 +00:00
mach-shark
mach-shmobile Updates of sound stuff for 3.4-rc1 2012-03-22 13:00:13 -07:00
mach-spear3xx arm: Fix typo in spear3[012]0.c 2012-02-21 11:44:45 +01:00
mach-spear6xx
mach-tegra Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2012-03-22 20:20:18 -07:00
mach-u300 ARM: U300: Don't specify regulator consumers by struct device 2012-02-17 13:42:49 -08:00
mach-ux500 ARM: 7346/1: errata: fix PL310 erratum #753970 workaround selection 2012-02-27 11:22:38 +00:00
mach-versatile irq_domain: Remove 'new' irq_domain in favour of the ppc one 2012-02-16 06:11:23 -07:00
mach-vexpress ARM: 7346/1: errata: fix PL310 erratum #753970 workaround selection 2012-02-27 11:22:38 +00:00
mach-vt8500
mach-w90x900
mach-zynq
mm Merge branch 'kmap_atomic' of git://github.com/congwang/linux 2012-03-21 09:40:26 -07:00
nwfpe
oprofile
plat-iop
plat-mxc Updates of sound stuff for 3.4-rc1 2012-03-22 13:00:13 -07:00
plat-nomadik Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-01-17 18:40:24 -08:00
plat-omap Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2012-03-22 20:20:18 -07:00
plat-orion ARM: orion: Fix USB phy for orion5x. 2012-02-09 16:16:35 -08:00
plat-pxa
plat-s3c24xx Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-03-20 21:12:50 -07:00
plat-s5p
plat-samsung ARM: SAMSUNG: Fix memory size for hsotg 2012-03-01 13:19:47 +09:00
plat-spear Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2012-03-22 20:20:18 -07:00
plat-versatile ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
tools
vfp
Kconfig ARM: 7345/1: errata: update workaround for A9 erratum #743622 2012-02-27 11:22:08 +00:00
Kconfig-nommu
Kconfig.debug
Makefile Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00