From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 8 May 2007 18:51:43 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v2.6.22-rc1~357
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=393bfca19ecdce60a8d9a4d2577cac11ca924a25;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

* master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
  Input: move USB miscellaneous devices under drivers/input/misc
  Input: move USB mice under drivers/input/mouse
  Input: move USB gamepads under drivers/input/joystick
  Input: move USB touchscreens under drivers/input/touchscreen
  Input: move USB tablets under drivers/input/tablet
  Input: i8042 - fix AUX port detection with some chips
  Input: aaed2000_kbd - convert to use polldev library
  Input: drivers/usb/input - usb_buffer_free() cleanup
  Input: synaptics - don't complain about failed resets
  Input: pull input.h into uinpit.h
  Input: drivers/usb/input - fix sparse warnings (signedness)
  Input: evdev - fix some sparse warnings (signedness, shadowing)
  Input: drivers/joystick - fix various sparse warnings
  Input: force feedback - make sure effect is present before playing
---

393bfca19ecdce60a8d9a4d2577cac11ca924a25