kernel-ark/drivers/input
Linus Torvalds 2ca7d674d7 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (257 commits)
  [ARM] Update mach-types
  ARM: 5636/1: Move vendor enum to AMBA include
  ARM: Fix pfn_valid() for sparse memory
  [ARM] orion5x: Add LaCie NAS 2Big Network support
  [ARM] pxa/sharpsl_pm: zaurus c3000 aka spitz: fix resume
  ARM: 5686/1: at91: Correct AC97 reset line in at91sam9263ek board
  ARM: 5640/1: This patch modifies the support of AC97 on the at91sam9263 ek board
  ARM: 5689/1: Update default config of HP Jornada 700-series machines
  ARM: 5691/1: fix cache aliasing issues between kmap() and kmap_atomic() with highmem
  ARM: 5688/1: ks8695_serial: disable_irq() lockup
  ARM: 5687/1: fix an oops with highmem
  ARM: 5684/1: Add nuc960 platform to w90x900
  ARM: 5683/1: Add nuc950 platform to w90x900
  ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform
  ARM: 5626/1: add suspend/resume functions to amba-pl011 serial driver
  ARM: 5625/1: fix hard coded 4K resource size in amba bus detection
  MMC: MMCI: convert realview MMC to use gpiolib
  ARM: 5685/1: Make MMCI driver compile without gpiolib
  ARM: implement highpte
  ARM: Show FIQ in /proc/interrupts on CONFIG_FIQ
  ...

Fix up trivial conflict in arch/arm/kernel/signal.c.

It was due to the TIF_NOTIFY_RESUME addition in commit d0420c83f ("KEYS:
Extend TIF_NOTIFY_RESUME to (almost) all architectures") and follow-ups.
2009-09-14 17:48:14 -07:00
..
gameport Input: serio - do not use deprecated dev.power.power_state 2009-05-09 16:10:18 -07:00
joystick Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2009-08-24 12:25:27 -07:00
keyboard Input: atkbd - add Compaq Presario R4000-series repeat quirk 2009-09-03 20:41:44 -07:00
misc Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2009-08-07 10:42:14 -07:00
mouse Input: gpio_mouse - use standard driver registration method 2009-07-07 22:47:14 -07:00
serio Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2009-09-05 13:41:29 -07:00
tablet Input: wacom - don't use on-stack memory for report buffers 2009-08-21 00:51:28 -07:00
touchscreen Merge branch 'master' into devel 2009-09-12 12:04:37 +01:00
apm-power.c
evbug.c
evdev.c Input: fix EVIOCGNAME/JSIOCGNAME regression 2009-07-13 22:24:29 -07:00
ff-core.c
ff-memless.c Input: ff-memless - fix signed to unsigned bit overflow 2009-05-07 19:04:16 -07:00
fixp-arith.h
input-compat.c
input-compat.h
input-polldev.c
input.c Driver Core: input: add nodename for input drivers 2009-06-15 21:30:26 -07:00
joydev.c Input: joydev - decouple axis and button map ioctls from input constants 2009-08-12 01:16:13 -07:00
Kconfig trivial: fix typos/grammar errors in Kconfig texts 2009-03-30 15:22:01 +02:00
Makefile
mousedev.c Input: simplify name handling for certain input handles 2009-05-11 00:11:43 -07:00
xen-kbdfront.c xen: remove driver_data direct access of struct device from more drivers 2009-06-15 21:30:28 -07:00