aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'core/locking' into tracing/ftraceIngo Molnar2009-03-134-17/+14
|\
| * Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2009-03-112-10/+0
| |\
| | * hvc_console: Remove tty->low_latency on pseries backendsBenjamin Herrenschmidt2009-03-112-10/+0
| * | intel-agp: fix a panic with 1M of shared memory, no GTT entriesLubomir Rintel2009-03-101-3/+5
| * | x86/agp: tighten check to update amd nb apertureYinghai Lu2009-03-101-4/+9
| |/
* | Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/coreIngo Molnar2009-02-242-3/+4
|\ \ | |/
| * m68k: atari - Rename "mfp" to "st_mfp"Geert Uytterhoeven2009-02-221-1/+1
| * sx.c: avoid referencing freed memory if copy_from_user() failsDan Carpenter2009-02-201-1/+1
| * sx.c: fix dbl statement if - add missing bracesIlpo Järvinen2009-02-201-1/+2
* | Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 't...Ingo Molnar2009-02-131-2/+2
|\ \ | |/
| * tpm: correct email address for tpm_infineon-driverMarcel Selhorst2009-02-111-2/+2
* | Merge commit 'v2.6.29-rc4' into tracing/coreIngo Molnar2009-02-091-3/+5
|\ \ | |/
| * sx.c: fix missed unlock_kernel() on error path in sx_fw_ioctl()Dan Carpenter2009-02-051-3/+5
* | Merge branches 'tracing/ftrace' and 'linus' into tracing/coreIngo Molnar2009-02-051-1/+1
|\ \ | |/
| * Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-02-031-1/+1
| |\
| | * NVRAM depends on RTC_DRV_CMOSUwe Kleine-König2009-01-311-1/+1
* | | Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing...Ingo Molnar2009-02-033-3/+5
|\ \ \ | |/ /
| * | Fix memory corruption in console selectionMikulas Patocka2009-01-311-1/+1
| |/
| * tty_open can return to userspace holding tty_mutexEric Paris2009-01-271-1/+3
| * Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-01-261-1/+1
| |\
| | * [ARM] omap: ensure OMAP drivers pass a struct device to clk_get()Russell King2009-01-241-1/+1
* | | Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/coreIngo Molnar2009-01-1811-69/+207
|\ \ \ | |/ /
| * | hvc_console: Remove tty->low_latencyHendrik Brueckner2009-01-161-2/+0
| * | powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/charStephen Rothwell2009-01-161-9/+9
| * | synclink_gt: enable RI interruptPaul Fulghum2009-01-151-10/+6
| * | sysrq: add commentary on why we use the console loglevel over using KERN_EMERGAndy Whitcroft2009-01-151-0/+6
| * | tty: Fix race in the flush for some ldiscsAlan Cox2009-01-151-1/+1
| |/
| * hvc_console: Use kzalloc() instead of kmalloc() + memset()Milton Miller2009-01-131-3/+1
| * hvc_console: Do not set low_latency when using interruptsMilton Miller2009-01-131-1/+2
| * hvc_console: Call free_irq() only if request_irq() was successfulMilton Miller2009-01-131-1/+1
| * hvc_console: Change an mb() to smp_mb() and add some commentsMilton Miller2009-01-131-2/+5
| * powerpc: Cleanup from l64 to ll64 change: drivers/charStephen Rothwell2009-01-131-1/+1
| * pty: Fix documentationAlan Cox2009-01-121-3/+1
| * m68k: amiserial - Kill warn_unused_result warningsGeert Uytterhoeven2009-01-121-6/+30
| * m68k: ser_a2232 - Kill warn_unused_result warningsGeert Uytterhoeven2009-01-121-2/+10
| * m68k: vme_scc - Kill warn_unused_result warningsGeert Uytterhoeven2009-01-121-30/+136
* | Merge commit 'v2.6.29-rc1' into tracing/urgentIngo Molnar2009-01-1115-204/+318
|\ \ | |/
| * Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6Linus Torvalds2009-01-091-150/+270
| |\
| | * [S390] hvc_iucv: Special handling of IUCV HVC devicesHendrik Brueckner2009-01-091-12/+28
| | * [S390] hvc_iucv: Refactor console and device initializationHendrik Brueckner2009-01-091-16/+9
| | * [S390] hvc_iucv: Update function documentationHendrik Brueckner2009-01-091-101/+75
| | * [S390] hvc_iucv: Limit rate of outgoing IUCV messagesHendrik Brueckner2009-01-091-37/+174
| | * [S390] hvc_iucv: Change IUCV term id and use one device as defaultHendrik Brueckner2009-01-091-3/+3
| * | Merge branch 'linus' into releaseLen Brown2009-01-0962-2390/+3378
| |\ \ | | |/
| | * Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6Linus Torvalds2009-01-081-13/+4
| | |\
| | | * RTC: Remove the BKL.David John2009-01-081-13/+4
| | * | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2009-01-082-2/+3
| | |\ \
| | | * | powerpc/cell: Use correct types in beat filesIngo Molnar2009-01-081-2/+2
| | | * | powerpc: Fix iseries drivers build failure without CONFIG_VIOPATHKamalesh Babulal2009-01-081-0/+1
| | * | | Make various things staticRoel Kluin2009-01-082-3/+2