git.karo-electronics.de Git - mv-sheeva.git/commit - arch/arm/plat-mxc/include/mach/hardware.h

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: add SW_ROTATE_LOCK switch type
  Input: fix force feedback capability query example
  Input: wacom_w8001 - add single-touch support
  Input: add Austria Microsystem AS5011 joystick driver
  Input: remove aaed2000 keyboard driver
  Input: i8042 - introduce 'notimeout' blacklist for Dell Vostro V13
  Input: cy8ctmg110_ts - Convert to dev_pm_ops
  Input: migor_ts - convert to dev_pm_ops
  Input: mcs5000_ts - convert to dev_pm_ops
  Input: eeti_ts - convert to dev_pm_ops
  Input: ad7879 - convert I2C to dev_pm_ops

author	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 13 Jan 2011 17:58:14 +0000 (09:58 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 13 Jan 2011 17:58:14 +0000 (09:58 -0800)
commit	d24450e2075b9ceeef8ad942e6391bc73eae6933
tree	f8966325219aa28089f9d3dc944433c5658168ab	tree \| snapshot
parent	5cb2fad28fd8f95e911bed8c9342435a5b8e67de	commit \| diff
parent	01c728a246a1072fe9664b91179a47937182b0a0	commit \| diff

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/Makefile	diff1 \|	diff2 \|	blob \| history
include/linux/input.h	diff1 \|	diff2 \|	blob \| history