Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
commit7db9cbb3748c46b80e5c99ffa91945b8dd4ed5e5
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Aug 2008 16:28:16 +0000 (15 09:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Aug 2008 16:28:16 +0000 (15 09:28 -0700)
treeda77cbf20ba01168aa48c14a71ef8ed8d8426e78
parentffaa5b984a9322bbd5d9a7f0814ca2ce70feebe5
parentcbbdece3048d0844b1cc6f4f8d18085e190721d7
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xilinx_ps2 - fix warning
  Input: bcm5974 - implement autosuspend support
  Input: bcm5974 - add driver for Macbook Air and Pro Penryn touchpads
  Input: paper over a bug in Synaptics X driver
  Input: evdev - split EVIOCGBIT handlig into a separate function
  Input: i8042 - Add Dritek quirk for Acer TravelMate 4280
  Input: xpad - add Pelican Eclipse D-Pad to the list of devices
  Input: gpio-keys - make gpio_keys_device_driver static
  Input: gpio-keys - fix possible NULL pointer dereference
  Input: wm97xx - enable sub-drivers by default