Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-16 16:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
ff4b8a57f0
linux/drivers/input/misc
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
..
88pm860x_onkey.c mfd: Adopt mfd_data in 88pm860x input driver 2011-03-23 10:42:06 +01:00
ab8500-ponkey.c Input: ab8500-ponkey - fix IRQ freeing in error path 2010-10-24 21:56:17 -07:00
ad714x-i2c.c Merge commit 'v3.1-rc4' into next 2011-09-07 14:18:36 -07:00
ad714x-spi.c Input: ad714x - read the interrupt status registers in a row 2011-08-22 09:59:26 -07:00
ad714x.c drivers/input: Add module.h to modular drivers implicitly using it 2011-10-31 19:31:16 -04:00
ad714x.h Input: ad714x - read the interrupt status registers in a row 2011-08-22 09:59:26 -07:00
adxl34x-i2c.c Input: adxl34x-i2c - convert to dev_pm_ops 2011-02-21 01:02:31 -08:00
adxl34x-spi.c Input: adxl34x - fix references to adx134x 2011-02-21 01:02:32 -08:00
adxl34x.c drivers/input: Add module.h to modular drivers implicitly using it 2011-10-31 19:31:16 -04:00
adxl34x.h Input: adxl34 - make enable/disable separate from suspend/resume 2010-07-03 13:13:21 -07:00
apanel.c Input: make i2c device ids constant 2010-01-09 23:28:33 -08:00
ati_remote2.c USB: convert drivers/input/* to use module_usb_driver() 2011-11-18 09:48:31 -08:00
atlas_btns.c Input: atlas_btns - switch to using pr_err() and friends 2010-07-13 09:43:24 -07:00
bfin_rotary.c Input: remove unneeded version.h includes 2011-06-27 12:42:54 -07:00
bma150.c Input: add driver for Bosch Sensortec's BMA150 accelerometer 2011-08-09 01:33:04 -07:00
cm109.c Input: cm109 - fix checking return value of usb_control_msg 2011-08-26 23:20:30 -07:00
cma3000_d0x_i2c.c Input: cma3000_d0x_i2c - add MODULE_DEVICE_TABLE 2010-12-07 22:13:40 -08:00
cma3000_d0x.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2011-12-19 15:11:12 -08:00
cma3000_d0x.h Input: add CMA3000 accelerometer driver 2010-11-30 23:05:21 -08:00
cobalt_btns.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
dm355evm_keys.c drivers/input: Add module.h to modular drivers implicitly using it 2011-10-31 19:31:16 -04:00
hp_sdc_rtc.c Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:49:54 -07:00
ixp4xx-beeper.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
Kconfig Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
keyspan_remote.c USB: convert drivers/input/* to use module_usb_driver() 2011-11-18 09:48:31 -08:00
kxtj9.c Input: kxtj9 - explicitly include module.h 2011-07-30 12:03:32 -07:00
m68kspkr.c
Makefile Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
max8925_onkey.c input: Monitor both onkey up and down event 2010-10-29 00:29:46 +02:00
mc13783-pwrbutton.c input: Add power button support for mc13783 2011-10-24 14:09:14 +02:00
mma8450.c Input: mma8450 - silence some 'uninitialized variable' warnings 2011-10-06 19:41:57 -07:00
mpu3050.c Input: mpu3050 - correct call to input_free_device 2011-08-11 09:22:40 -07:00
pcap_keys.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pcf8574_keypad.c Input: pcf_keypad - convert to dev_op_ops 2010-11-11 22:02:57 -08:00
pcf50633-input.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pcspkr.c i8253: Make pcspkr input driver use the shared i8253_lock 2011-06-09 15:01:38 +02:00
pm8xxx-vibrator.c Input: add support for pm8xxx based vibrator driver 2011-08-02 22:21:17 -07:00
pmic8xxx-pwrkey.c input: pmic8xxx-pwrkey: Do not use mfd_get_data() 2011-07-05 10:38:43 +02:00
powermate.c USB: convert drivers/input/* to use module_usb_driver() 2011-11-18 09:48:31 -08:00
pwm-beeper.c Input: Add pwm beeper driver 2010-07-14 01:23:11 -07:00
rb532_button.c Input: add driver for S1 button of rb532 2009-03-09 20:10:12 -07:00
rotary_encoder.c doc: fix broken references 2011-09-27 18:08:04 +02:00
sgi_btns.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
sparcspkr.c dt/sparc: Eliminate users of of_platform_{,un}register_driver 2011-02-28 01:36:39 -07:00
twl4030-pwrbutton.c Input: twl4030-pwrbutton - fix a leak of the IRQ during init failure 2011-04-27 23:11:33 -07:00
twl4030-vibra.c MFD: twl4030-audio: Rename platform data 2011-07-04 18:44:02 +03:00
twl6040-vibra.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 2011-10-28 14:25:01 -07:00
uinput.c Input: uinput - allow for 0/0 min/max on absolute axes. 2011-03-31 00:02:39 -07:00
wistron_btns.c Fix common misspellings 2011-03-31 11:26:23 -03:00
wm831x-on.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
xen-kbdfront.c Input: xen-kbdfront - enable driver for HVM guests 2011-07-04 19:31:19 -07:00
yealink.c USB: convert drivers/input/* to use module_usb_driver() 2011-11-18 09:48:31 -08:00
yealink.h tree-wide: Assorted spelling fixes 2010-02-09 11:13:56 +01:00