summaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'origin'Benjamin Herrenschmidt2008-10-1561-2194/+2626
|\
| * Revert "vt: fix background color on line feed"Linus Torvalds2008-10-141-3/+2
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2008-10-134-130/+79
| |\
| | * pcmcia: remove unused argument to pcmcia_parse_tuple()Dominik Brodowski2008-08-312-4/+4
| | * pcmcia: card services header cleanupDominik Brodowski2008-08-311-1/+1
| | * pcmcia: deprecate CS_SUCCESSDominik Brodowski2008-08-232-20/+20
| | * pcmcia: remove remaining in-kernel pcmcia_get_configuration_info() usersDominik Brodowski2008-08-231-10/+0
| | * pcmcia: pcmcia_config_loop() improvement by passing vccDominik Brodowski2008-08-232-0/+2
| | * pcmcia: pcmcia_config_loop() default CIS entry handlingDominik Brodowski2008-08-232-0/+2
| | * pcmcia: pcmcia_config_loop() ConfigIndex unificationDominik Brodowski2008-08-232-4/+0
| | * pcmcia: use pcmcia_loop_config in misc pcmcia driversDominik Brodowski2008-08-232-95/+54
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2008-10-133-52/+61
| |\ \
| | * \ Merge branch 'next' into for-linusJames Morris2008-10-133-52/+61
| | |\ \
| | | * | As pointed out by Jonathan Corbet, the timer must be deleted beforeRajiv Andrade2008-10-111-1/+1
| | | * | The tpm_dev_release function is only called for platform devices, not pnpRajiv Andrade2008-10-113-7/+30
| | | * | Protect tpm_chip_list when transversing it.Rajiv Andrade2008-10-111-37/+24
| | | * | Renames num_open to is_open, as only one process can open the file at a time.Rajiv Andrade2008-10-112-5/+4
| | | * | Remove the BKL calls from the TPM driver, which were added in the overallRajiv Andrade2008-10-111-4/+4
| * | | | Merge phase #5 (misc) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/li...Linus Torvalds2008-10-131-70/+89
| |\ \ \ \
| | * \ \ \ Merge branches 'oprofile-v2' and 'timers/hpet' into x86/core-v4Ingo Molnar2008-10-131-70/+89
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | HPET: Remove spurious HPET busy warning message.David John2008-10-101-4/+0
| | | * | | Merge commit 'v2.6.27' into timers/hpetIngo Molnar2008-10-101-2/+12
| | | |\ \ \
| | | * \ \ \ Merge commit 'v2.6.27-rc6' into timers/hpetIngo Molnar2008-09-1441-1429/+350
| | | |\ \ \ \
| | | * | | | | hpet: /dev/hpet - fixes and cleanup, fixDavid Brownell2008-07-311-2/+4
| | | * | | | | hpet: /dev/hpet - fixes and cleanupDavid Brownell2008-07-311-66/+24
| | | * | | | | Merge branch 'linus' into timers/hpetIngo Molnar2008-07-31258-69624/+6155
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | Merge branch 'linus' into timers/hpetIngo Molnar2008-06-1610-28/+199
| | | |\ \ \ \ \
| | | * | | | | | x86: get irq for hpet timerKevin Hao2008-06-021-0/+63
| * | | | | | | | tty: rename the remaining oddly named n_tty functionsAlan Cox2008-10-131-13/+13
| * | | | | | | | tty: tty_io.c shadows sparse fixJason Wessel2008-10-131-4/+4
| * | | | | | | | applicom: Fix an unchecked user ioctl range and an error returnAlan Cox2008-10-131-4/+2
| * | | | | | | | tty: Minor tidyups and document fixes for n_ttyAlan Cox2008-10-131-11/+37
| * | | | | | | | tty: Remove lots of NULL checksAlan Cox2008-10-136-79/+1
| * | | | | | | | tty: some ICANON magic is in the wrong placesAlan Cox2008-10-133-43/+54
| * | | | | | | | tty: simplify ktermios allocationAlan Cox2008-10-131-39/+7
| * | | | | | | | pty: simplify unix98 allocationAlan Cox2008-10-131-11/+7
| * | | | | | | | pty: Fix allocation failure double freeAlan Cox2008-10-131-2/+0
| * | | | | | | | pty: Coding style and polishAlan Cox2008-10-131-42/+44
| * | | | | | | | Add an instance parameter devpts interfacesSukadev Bhattiprolu2008-10-132-14/+18
| * | | | | | | | Move tty lookup/reopen to callerSukadev Bhattiprolu2008-10-131-15/+16
| * | | | | | | | tty: extract the pty init time special casesAlan Cox2008-10-132-142/+182
| * | | | | | | | tty: Finish fixing up the init_dev interface to use ERR_PTRAlan Cox2008-10-132-33/+25
| * | | | | | | | tty: More driver operationsAlan Cox2008-10-132-10/+63
| * | | | | | | | tty: kref the tty driver objectAlan Cox2008-10-133-53/+68
| * | | | | | | | tty: Clean up the tty_init_dev changes furtherAlan Cox2008-10-132-41/+72
| * | | | | | | | tty: Move parts of tty_init_dev into new functionsSukadev Bhattiprolu2008-10-131-52/+87
| * | | | | | | | tty: Remove more special casing and out of place codeAlan Cox2008-10-134-155/+188
| * | | | | | | | tty: shutdown methodAlan Cox2008-10-133-41/+57
| * | | | | | | | vt: remove bogus lock droppingAlan Cox2008-10-131-18/+0
| * | | | | | | | pty: If the administrator creates a device for a ptmx slave we should not errorAlan Cox2008-10-131-6/+12