Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
gameport	Input: emu10k1 - do not leave device enabled when probe fails	2010-10-13 07:49:23 -07:00
joystick	Input: turbografx - fix reference counting	2010-12-01 09:20:34 -08:00
keyboard	Input: add input driver for polled GPIO buttons	2010-12-06 17:15:15 -08:00
misc	Input: pcf8574_keypad - fix error handling in pcf8574_kp_probe	2010-11-11 00:12:13 -08:00
mouse	Input: synaptics - fix handling of 2-button ClickPads	2010-11-30 23:59:41 -08:00
serio	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
tablet	Input: wacom - add another Bamboo Pen ID (0xd4)	2010-12-10 23:04:43 -08:00
touchscreen	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
apm-power.c
evbug.c
evdev.c	Input: define separate EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2	2010-12-14 23:55:21 -08:00
ff-core.c
ff-memless.c
fixp-arith.h
input-compat.c
input-compat.h
input-polldev.c
input.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-11-19 10:31:04 -08:00
joydev.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:52:56 -07:00
Kconfig
Makefile
mousedev.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-10-25 07:59:01 -07:00
sparse-keymap.c	Input: sparse-keymap - switch to using new keycode interface	2010-09-09 22:01:07 -07:00
xen-kbdfront.c	xenbus: prevent warnings on unhandled enumeration values	2010-10-18 10:49:36 -04:00