aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
Commit message (Expand)AuthorAgeFilesLines
* kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-205-28/+28
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2011-01-132-2/+2
|\
| * Merge branch 'master' into for-nextJiri Kosina2010-12-2220-171/+517
| |\
| * | Kconfig: typo: boad -> boardMichael Witten2010-11-021-1/+1
| * | tree-wide: fix comment/printk typosUwe Kleine-König2010-11-011-1/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2011-01-1314-264/+599
|\ \ \
| * \ \ Merge branch 'next' into for-linusDmitry Torokhov2011-01-1114-264/+599
| |\ \ \
| | * | | Input: wacom_w8001 - add single-touch supportPing Cheng2011-01-111-33/+149
| | * | | Input: add Austria Microsystem AS5011 joystick driverFabien Marteau2011-01-103-0/+378
| | * | | Input: remove aaed2000 keyboard driverJamie Iles2011-01-083-199/+0
| | * | | Input: i8042 - introduce 'notimeout' blacklist for Dell Vostro V13Jiri Kosina2011-01-082-1/+26
| | * | | Input: cy8ctmg110_ts - Convert to dev_pm_opsMark Brown2011-01-061-6/+9
| | * | | Input: migor_ts - convert to dev_pm_opsMark Brown2011-01-061-4/+8
| | * | | Input: mcs5000_ts - convert to dev_pm_opsMark Brown2011-01-061-7/+10
| | * | | Input: eeti_ts - convert to dev_pm_opsMark Brown2011-01-061-7/+9
| | * | | Input: ad7879 - convert I2C to dev_pm_opsMark Brown2011-01-061-7/+10
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-01-101-0/+40
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into upstreamJiri Kosina2010-12-1068-912/+6341
| |\ \ \ \ \
| * | | | | | input: bcm5974: Add support for MacBookAir3Edgar (gimli) Hucek2010-11-151-0/+40
* | | | | | | Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...Linus Torvalds2011-01-071-1/+1
|\ \ \ \ \ \ \
| * | | | | | | gameport: use this_cpu_read instead of lookupChristoph Lameter2011-01-041-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2011-01-0749-610/+2698
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'next' into for-linusDmitry Torokhov2011-01-0648-610/+2690
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Input: wacom_w8001 - support pen or touch only devicesPing Cheng2010-12-301-12/+32
| | * | | | | Input: wacom_w8001 - use __set_bit to set keybitsPing Cheng2010-12-271-5/+5
| | * | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/...Dmitry Torokhov2010-12-275-6/+121
| | |\ \ \ \ \
| | | * | | | | Input: synaptics - ignore bogus mt packetHenrik Rydberg2010-12-221-2/+2
| | | * | | | | Input: synaptics - add multi-finger and semi-mt supportHenrik Rydberg2010-12-212-3/+88
| | | * | | | | Input: synaptics - report clickpad propertyHenrik Rydberg2010-12-211-0/+3
| | | * | | | | Input: fix double equality sign in ueventHenrik Rydberg2010-12-201-1/+1
| | | * | | | | Input: introduce device propertiesHenrik Rydberg2010-12-203-0/+27
| | * | | | | | Input: bu21013_ts - fix misuse of logical operation in place of bitopDavid Sterba2010-12-271-1/+1
| | * | | | | | Input: i8042 - add Acer Aspire 5100 to the Dritek listPali Rohár2010-12-271-0/+7
| | * | | | | | Input: psmouse - disable the synaptics extension on OLPC machinesAndres Salomon2010-12-231-0/+30
| | * | | | | | Input: psmouse - fix up Synaptics commentAndres Salomon2010-12-231-2/+2
| | * | | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/...Dmitry Torokhov2010-12-167-91/+188
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | input: mt: Move tracking and pointer emulation to input-mtHenrik Rydberg2010-12-164-43/+120
| | | * | | | | input: mt: Collect slots initialization codeHenrik Rydberg2010-12-164-10/+16
| | | * | | | | input: mt: Break out slots handlingHenrik Rydberg2010-12-166-49/+63
| | * | | | | | Input: add ST1232 touchscreen controller driverTony SIM2010-12-153-5/+292
| | * | | | | | Input: cma3000_d0x_i2c - add MODULE_DEVICE_TABLEDmitry Torokhov2010-12-071-0/+2
| | * | | | | | Input: tca6416-keypad - add support for tca6408aTony SIM2010-12-072-7/+16
| | * | | | | | Input: use pr_fmt and pr_<level>Joe Perches2010-11-3010-68/+72
| | * | | | | | Input: i8042 - use pr_<level>, pr_fmt, fix dbg and __FILE__ useJoe Perches2010-11-303-73/+63
| | * | | | | | Input: add CMA3000 accelerometer driverHemanth V2010-11-305-0/+607
| | * | | | | | Input: iforce - clean up MakefileDmitry Torokhov2010-11-221-12/+3
| | * | | | | | Input: clean up Makefile (use input-core-y)Dmitry Torokhov2010-11-221-1/+1
| | * | | | | | Input: ct82c710 - remove a redundant serio_register_port()Axel Lin2010-11-211-5/+3
| | * | | | | | Input: ams_delta_serio - fix wrong kfree in ams_delta_serio_exitAxel Lin2010-11-211-1/+0
| | * | | | | | Input: ps2mult - fix wrong kfree in ps2mult_connect error pathAxel Lin2010-11-211-1/+1