summaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linus' into tracing/kmemtraceIngo Molnar2008-12-317-39/+60
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linusLinus Torvalds2008-12-302-1/+30
| |\
| | * virtio_console: support console resizingChristian Borntraeger2008-12-302-1/+30
| * | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-12-302-18/+15
| |\ \
| | * \ Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/l...Russell King2008-12-172-7/+7
| | |\ \
| | * \ \ Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/gi...Russell King2008-12-151-1/+1
| | |\ \ \
| | * \ \ \ Merge git://git.marvell.com/orion into develRussell King2008-12-134-13/+17
| | |\ \ \ \
| | * | | | | [ARM] netwinder: clean up GPIO namingRussell King2008-12-132-18/+15
| * | | | | | Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airl...Linus Torvalds2008-12-301-2/+9
| |\ \ \ \ \ \
| | * | | | | | agp/intel: Fix broken ® symbol in device name.Eric Anholt2008-12-291-1/+1
| | * | | | | | agp/intel: add support for G41 chipsetZhenyu Wang2008-12-291-1/+8
| * | | | | | | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2008-12-301-17/+5
| |\ \ \ \ \ \ \
| | | \ \ \ \ \ \
| | | \ \ \ \ \ \
| | | \ \ \ \ \ \
| | | \ \ \ \ \ \
| | *---. | | | | | | Merge branches 'irq/sparseirq', 'irq/genirq' and 'irq/urgent'; commit 'v2.6.2...Ingo Molnar2008-12-2513-56/+30
| | |\ \ \| | | | | | | | | |_|_|/ / / / / | | |/| | | / / / / | | | | | |/ / / / | | | | |/| | | |
| | | * | | | | | sparse irq_desc[] array: core kernel and x86 changesYinghai Lu2008-12-081-17/+5
| | | | |_|/ / / | | | |/| | | |
| * | | | | | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-12-301-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | | | | | | |
| | | \ \ \ \ \
| | | \ \ \ \ \
| | | \ \ \ \ \
| | | \ \ \ \ \
| | | \ \ \ \ \
| | *-----. \ \ \ \ \ Merge branches 'timers/clocksource', 'timers/hpet', 'timers/hrtimers', 'timer...Ingo Molnar2008-12-251-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| / / / / | | | | |_|_|/ / / / | | | |/| | | | / / | | | |_|_|_|_|/ / | | |/| | | | | |
| | | | * | | | | x86: correct link to HPET timer specificationDenis V. Lunev2008-11-241-1/+1
| | | | |/ / / /
| | | | | | | |
| \ \ \ \ \ \ \
*-. | | | | | | | 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-2810-40/+174
| | |\ \ \ \ \ \ \
| | | * | | | | | | hvc_console: Escape magic sysrq keyHendrik Brueckner2008-12-211-2/+5
| | | * | | | | | | Merge branch 'linux-2.6' into nextPaul Mackerras2008-12-186-18/+0
| | | |\| | | | | |
| | | * | | | | | | Merge branch 'merge' into nextPaul Mackerras2008-12-163-8/+8
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | * | | | | | | hvc_console: Always schedule resize work on resizeHendrik Brueckner2008-12-031-4/+2
| | | * | | | | | | 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-281-141/+123
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | [PATCH] nvram - convert PRINT_PROC to seq_fileWim Van Sebroeck2008-11-111-78/+82
| | | * | | | | | | | [PATCH] nvram - CodingStyleWim Van Sebroeck2008-11-111-74/+52
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | 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/+8
|\| | | | | | | | |
| * | | | | | | | | xilinx_hwicap: remove improper wording in license statementGreg Kroah-Hartman2008-12-176-18/+0
| | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | 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-11-301-4/+5
| |\ \ \ \ \ \