kevin/linux
1
Fork 0
Code
ff4b8a57f0
linux/drivers/input
History
Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2012-01-06 11:42:52 -08:00
..
gameport i8253: Create linux/i8253.h and use it in all 8253 related files 2011-06-09 15:01:37 +02:00
joystick USB: convert drivers/input/* to use module_usb_driver() 2011-11-18 09:48:31 -08:00
keyboard drivers/input: Add module.h to modular drivers implicitly using it 2011-10-31 19:31:16 -04:00
misc Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
mouse Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
serio Input: ams_delta_serio - include linux/module.h 2011-11-09 21:19:54 -08:00
tablet Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
touchscreen USB: convert drivers/input/* to use module_usb_driver() 2011-11-18 09:48:31 -08:00
apm-power.c Input: use pr_fmt and pr_<level> 2010-11-30 23:10:26 -08:00
evbug.c Input: use pr_fmt and pr_<level> 2010-11-30 23:10:26 -08:00
evdev.c Input: evdev - try to wake up readers only if we have full packet 2011-06-18 02:54:02 -07:00
ff-core.c Input: force feedback - potential integer wrap in input_ff_create() 2011-10-12 21:13:11 -07:00
ff-memless.c Input: use pr_fmt and pr_<level> 2010-11-30 23:10:26 -08:00
fixp-arith.h
input-compat.c drivers/input: add export.h to symbol exporting files. 2011-10-31 19:31:16 -04:00
input-compat.h arch/tile: finish enabling support for TILE-Gx 64-bit chip 2011-05-12 15:52:12 -04:00
input-mt.c drivers/input: add export.h to symbol exporting files. 2011-10-31 19:31:16 -04:00
input-polldev.c drivers/input: Add module.h to modular drivers implicitly using it 2011-10-31 19:31:16 -04:00
input.c Input: properly assign return value of clamp() macro. 2011-05-25 09:24:58 -07:00
joydev.c Input: remove useless synchronize_rcu() calls 2011-05-12 08:28:57 -07:00
Kconfig um: switch to use of drivers/Kconfig 2011-11-02 14:15:41 +01:00
Makefile Input: xen-kbdfront - move to drivers/input/misc 2011-03-16 23:26:01 -07:00
mousedev.c Input: properly assign return value of clamp() macro. 2011-05-25 09:24:58 -07:00
sparse-keymap.c drivers/input: Add module.h to modular drivers implicitly using it 2011-10-31 19:31:16 -04:00