linux/arch/m68k
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
..
amiga treewide: convert uses of ATTRIB_NORETURN to __noreturn 2012-01-12 20:13:03 -08:00
apollo m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
atari m68k: Fix assembler constraint to prevent overeager gcc optimisation 2012-01-22 14:50:20 +01:00
bvme6000 m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
configs m68k/serial: Remove references to obsolete serial config options 2011-12-28 20:14:41 +01:00
emu TTY: remove re-assignments to tty_driver members 2012-03-08 11:37:58 -08:00
fpsp040 Fix common misspellings 2011-03-31 11:26:23 -03:00
hp300 m68k/hp300: Export hp300_ledstate 2011-12-10 19:52:48 +01:00
ifpsp060 Fix common misspellings 2011-03-31 11:26:23 -03:00
include/asm Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2012-03-21 18:17:51 -07:00
kernel Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2012-03-21 18:17:51 -07:00
lib m68k: modify user space access functions to support ColdFire CPUs 2011-12-30 10:20:21 +10:00
mac m68k/mac: cleanup macro case 2011-12-10 19:52:48 +01:00
math-emu m68k/math-emu: Remove unnecessary code 2011-07-30 21:21:40 +02:00
mm m68k: Do not set global share for non-kernel shared pages 2012-02-07 11:25:57 +10:00
mvme16x m68k/mvme16x: Add support for EARLY_PRINTK 2011-12-10 19:52:45 +01:00
mvme147 m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
platform m68knommu: factor more common ColdFire cpu reset code 2012-03-05 10:42:28 +10:00
q40 Input: q40kbd - convert driver to the split model 2012-01-23 00:02:31 -08:00
sun3 m68k/irq: Remove obsolete support for user vector interrupt fixups 2011-11-08 22:35:52 +01:00
sun3x include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
tools/amiga Convert files to UTF-8 and some cleanups 2007-10-19 23:21:04 +02:00
install.sh kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00
Kconfig m68k: make support for FPU hardware configurable 2012-03-05 09:43:05 +10:00
Kconfig.bus m68k: Revive lost DIO bus config option 2011-11-08 22:35:46 +01:00
Kconfig.cpu m68k: allow ColdFire 547x and 548x CPUs to be built with MMU enabled 2011-12-30 10:20:50 +10:00
Kconfig.debug Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 2012-01-06 18:28:12 -08:00
Kconfig.devices m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac 2012-01-04 22:23:50 +01:00
Kconfig.machine m68k/Kconfig: Separate classic m68k and coldfire early 2011-12-30 10:20:49 +10:00
Makefile m68k: merge mmu and non-mmu arch Makefiles 2011-10-18 14:22:25 +10:00