summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
Commit message (Expand)AuthorAgeFilesLines
*---. Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/...Linus Torvalds2011-03-171-1/+2
|\ \ \
| | | \
| | | \
| | | \
| | | \
| | *---. \ Merge branches 'aaci', 'mmci-dma', 'pl' and 'pl011' into driversRussell King2011-03-174-13/+35
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | | * | ARM: amba: make probe() functions take const id tablesRussell King2011-02-231-1/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epi...Linus Torvalds2011-03-172-0/+75
|\ \ \ \ \
| * | | | | unicore32 io: redefine __REG(x) and re-use readl/writel funcsGuanXuetao2011-03-171-4/+4
| * | | | | unicore32 i8042 upgrade and bugfix: adjust resource request region typeGuanXuetao2011-03-171-2/+2
| * | | | | unicore32 i8042: adjust io funcs of i8042-unicore32io.hGuanXuetao2011-03-171-9/+12
| * | | | | unicore32 machine related files: ps2 driverGuanXuetao2011-03-172-0/+72
| | |_|_|/ | |/| | |
* | | | | Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2011-03-163-11/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | dt: Eliminate of_platform_{,un}register_driverGrant Likely2011-02-281-5/+4
| * | | | dt/sparc: Eliminate users of of_platform_{,un}register_driverGrant Likely2011-02-281-4/+4
| * | | | Merge commit 'v2.6.38-rc6' into devicetree/nextGrant Likely2011-02-281-4/+7
| |\ \ \ \ | | |/ / /
| * | | | altera_ps2: Add devicetree supportWalter Goossens2011-02-151-2/+13
| | |_|/ | |/| |
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2011-02-231-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Input: serio/gameport - use 'long' system workqueueDmitry Torokhov2011-02-231-1/+1
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2011-02-151-4/+7
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Input: serio - clear pending rescans after sysfs driver rebindDuncan Laurie2011-02-021-4/+7
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2011-01-262-7/+25
|\ \ \ | |/ / | | / | |/ |/|
| * Input: serio - allow registered drivers to get status flagDavid Engraf2011-01-201-4/+20
| * Input: ct82710c - return proper error code for ct82c710_openDavidlohr Bueso2011-01-171-3/+5
* | kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-201-3/+3
* | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2011-01-131-1/+1
|\ \
| * \ Merge branch 'master' into for-nextJiri Kosina2010-12-223-2/+12
| |\ \
| * | | Kconfig: typo: boad -> boardMichael Witten2010-11-021-1/+1
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2011-01-132-1/+26
|\ \ \ \ | | |_|/ | |/| |
| * | | Input: i8042 - introduce 'notimeout' blacklist for Dell Vostro V13Jiri Kosina2011-01-082-1/+26
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2011-01-079-175/+157
|\ \ \ \ | |/ / /
| * | | Input: i8042 - add Acer Aspire 5100 to the Dritek listPali Rohár2010-12-271-0/+7
| * | | Input: i8042 - use pr_<level>, pr_fmt, fix dbg and __FILE__ useJoe Perches2010-11-303-73/+63
| * | | 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
| * | | Input: serio HIL MLC - don't deref null, don't leak and return proper errorJesper Juhl2010-11-202-9/+14
| * | | Input: serio - convert to common workqueue instead of a threadDmitry Torokhov2010-11-181-86/+69
* | | | Merge branch 'devel-omap-irq' into omap-for-linusTony Lindgren2010-12-101-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | parisc: Fix GSC PS/2 driver name for keyboard and mouseGuy Martin2010-12-041-1/+1
* | | | Merge branches 'devel-cleanup', 'devel-serial' and 'devel-board' into omap-fo...Tony Lindgren2010-11-301-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | OMAP1: drop AMS_DELTA_FIQ config optionJanusz Krzysztofik2010-11-301-1/+0
| | |/ | |/|
* | | BKL: remove extraneous #include <smp_lock.h>Arnd Bergmann2010-11-171-1/+0
| |/ |/|
* | Input: i8042 - add Sony VAIOs to MUX blacklistJesse Barnes2010-11-041-0/+11
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2010-10-255-45/+410
|\
| * Input: serio - add support for PS2Mult multiplexer protocolDmitry Eremin-Solenikov2010-10-183-0/+328
| * Merge branch 'for-linus' into nextDmitry Torokhov2010-10-171-1/+1
| |\
| * | Input: serio - support multiple child devices per single parentDmitry Eremin-Solenikov2010-10-131-43/+81
| * | Input: i8042 - use unsigned char for 0x90Christoph Fritz2010-09-291-1/+1
| * | Input: serio - do not include linux/freezer.hDmitry Torokhov2010-09-141-1/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6Linus Torvalds2010-10-221-0/+1
|\ \ \
| * | | serport: place serport serio device correctly in the device treeDmitry Eremin-Solenikov2010-10-221-0/+1
| | |/ | |/|
* | | Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2010-10-221-0/+1
|\ \ \
| * | | llseek: automatically add .llseek fopArnd Bergmann2010-10-151-0/+1
| |/ /
OpenPOWER on IntegriCloud