summaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'tracing/docs', 'tracing/function-graph-tracer' and 'linus' in...Ingo Molnar2008-12-2914-196/+1220
|\ \
| | * Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/p...Linus Torvalds2008-12-2910-40/+174
| | |\
| | | * hvc_console: Escape magic sysrq keyHendrik Brueckner2008-12-211-2/+5
| | | * Merge branch 'linux-2.6' into nextPaul Mackerras2008-12-186-18/+0Star
| | | |\
| | | * \ Merge branch 'merge' into nextPaul Mackerras2008-12-163-8/+8
| | | |\ \
| | | * | | hvc_console: Always schedule resize work on resizeHendrik Brueckner2008-12-031-4/+2Star
| | | * | | powerpc: Make open count variables signed in hvcs/hvsi/hvc_consoleroel kluin2008-12-033-3/+3
| | | * | | drivers/hvc: Add missing of_node_putNicolas Palix2008-12-032-2/+6
| | | * | | powerpc/BSR: Support multiple OF-node description of BSRSonny Rao2008-12-031-29/+55
| | | * | | Merge branch 'merge'Paul Mackerras2008-12-034-13/+17
| | | |\ \ \
| | | * \ \ \ Merge branch 'linux-2.6' into nextPaul Mackerras2008-11-195-31/+35
| | | |\ \ \ \
| | | * | | | | powerpc: udbg-based backend for hvc_consoleDavid Gibson2008-11-193-0/+103
| | * | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-nvramLinus Torvalds2008-12-291-141/+123Star
| | |\ \ \ \ \ \
| | | * | | | | | [PATCH] nvram - convert PRINT_PROC to seq_fileWim Van Sebroeck2008-11-111-78/+82
| | | * | | | | | [PATCH] nvram - CodingStyleWim Van Sebroeck2008-11-111-74/+52Star
| | * | | | | | | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6Linus Torvalds2008-12-283-0/+861
| | |\ \ \ \ \ \ \
| | | * | | | | | | [S390] s390/hvc_console: z/VM IUCV hypervisor console supportHendrik Brueckner2008-12-253-0/+861
| | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2008-12-281-1/+17
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'next' into for-linusJames Morris2008-12-252-15/+62
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Audit: Log TIOCSTIAl Viro2008-12-092-17/+62
| | | * | | | | | Merge branch 'master' into nextJames Morris2008-12-044-13/+17
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | * | | | | | Merge branch 'master' into nextJames Morris2008-11-182-13/+13
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | * | | | | | Merge branch 'master' into nextJames Morris2008-11-146-23/+36
| | | |\ \ \ \ \ \
| | | * | | | | | | CRED: Wrap task credential accesses in the tty driverDavid Howells2008-11-141-2/+4
* | | | | | | | | | sysrq: fix ftrace help msg & doc.Randy Dunlap2008-12-261-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' i...Ingo Molnar2008-12-199-26/+8Star
|\| | | | | | | |
| * | | | | | | | xilinx_hwicap: remove improper wording in license statementGreg Kroah-Hartman2008-12-176-18/+0Star
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | console ASCII glyph 1:1 mappingIngo Brueckl2008-12-131-1/+1
| * | | | | | | unicode table for cp437Ingo Brueckl2008-12-131-6/+6
| * | | | | | | Fix incorrect use of loose in tty/serial driversNick Andrew2008-12-051-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge commit 'v2.6.28-rc7' into tracing/coreIngo Molnar2008-12-044-13/+17
|\| | | | | |
| * | | | | | drivers/char/tty_io.c: Avoid panic when no console is configured.Will Newton2008-12-011-6/+9
| * | | | | | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/...Linus Torvalds2008-12-011-4/+5
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into mergePaul Mackerras2008-11-241-4/+5
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | powerpc/virtex: fix various format/casting printk mismatchesGrant Likely2008-11-141-4/+5
| | | | |/ / / | | | |/| | |
| * | | | | | uninorth-agp section messAl Viro2008-11-301-1/+1
| * | | | | | istallion section warningsAl Viro2008-11-301-2/+2
| |/ / / / /
* | | | | | Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2008-11-195-31/+35
|\| | | | |
| * | | | | Merge branch 'doc-subdirs' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2008-11-152-13/+13
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Create/use more directory structure in the Documentation/ tree.Randy Dunlap2008-11-142-13/+13
| * | | | | Fix platform drivers that crash on suspend/resumeDarrick J. Wong2008-11-132-16/+20
| |/ / / /
| * | | | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds2008-11-121-2/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'misc' into releaseLen Brown2008-11-121-2/+2
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | ACPI: remove CONFIG_ACPI_ECBjorn Helgaas2008-11-061-2/+2
* | | | | Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2008-11-122-3/+6
|\| | | |
| * | | | tty: trivial - fix up email addresses in tty related stuffAlan Cox2008-11-112-3/+6
| |/ / /
* | | | Merge branch 'tracing/urgent' into tracing/ftraceIngo Molnar2008-11-111-2/+8
|\| | |
| * | | vt: incomplete initialization of vc_tab_stopWolfgang Kroworsch2008-11-071-2/+8
| | |/ | |/|
* / | ftrace: sysrq-z to dump the buffersPeter Zijlstra2008-11-041-1/+17
|/ /
* | saner FASYNC handling on file closeAl Viro2008-11-016-16/+0Star