tree f8966325219aa28089f9d3dc944433c5658168ab
parent 5cb2fad28fd8f95e911bed8c9342435a5b8e67de
parent 01c728a246a1072fe9664b91179a47937182b0a0
author Linus Torvalds <torvalds@linux-foundation.org> 1294941494 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294941494 -0800

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