aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAge
* Merge branch 'tracing/core-v2' into tracing-for-linusIngo Molnar2009-04-01
|\
| * Merge branches 'tracing/ftrace', 'tracing/kprobes', 'tracing/tasks' and 'linu...Ingo Molnar2009-03-20
| |\
| * \ Merge branches 'tracing/ftrace' and 'linus' into tracing/coreIngo Molnar2009-03-18
| |\ \
| * \ \ Merge branches 'tracing/ftrace', 'tracing/syscalls' and 'linus' into tracing/...Ingo Molnar2009-03-16
| |\ \ \
| * \ \ \ Merge branch 'core/locking' into tracing/ftraceIngo Molnar2009-03-12
| |\ \ \ \
| * \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/textedit' and 'linus' into tracing/...Ingo Molnar2009-03-10
| |\ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *-. \ \ \ \ \ Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'linus' ...Ingo Molnar2009-03-10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'x86/core' into tracing/texteditIngo Molnar2009-03-06
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/coreIngo Molnar2009-03-04
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/mmiotrace' and 'linus' into tracing...Ingo Molnar2009-03-02
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace' and 'linus' into tracing/coreIngo Molnar2009-02-27
| |\ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'linus' into...Ingo Molnar2009-02-25
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/coreIngo Molnar2009-02-24
| |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branches 'tracing/function-graph-tracer' and 'linus' into tracing/coreIngo Molnar2009-02-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'linus' into tracing/blktraceIngo Molnar2009-02-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2009-02-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 't...Ingo Molnar2009-02-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2009-02-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'v2.6.29-rc4' into tracing/coreIngo Molnar2009-02-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | ring_buffer: remove unused flags parameter, fixIngo Molnar2009-02-05
| * | | | | | | | | | | | | | | | | | | Merge branches 'tracing/ftrace' and 'linus' into tracing/coreIngo Molnar2009-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing...Ingo Molnar2009-02-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/coreIngo Molnar2009-01-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'v2.6.29-rc1' into tracing/urgentIngo Molnar2009-01-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'linus' into tracing/kmemtrace2Ingo Molnar2009-01-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'linus' into tracing/kmemtraceIngo Molnar2008-12-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/docs', 'tracing/function-graph-tracer' and 'linus' in...Ingo Molnar2008-12-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | sysrq: fix ftrace help msg & doc.Randy Dunlap2008-12-26
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds2009-04-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide-floppy: do not complete rq's prematurelyBorislav Petkov2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: be able to build pmac driver without IDE built-inGilles Espinasse2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide-pmac: IDE cable detection on Apple PowerBookTOMARI Hisanobu2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: inline SELECT_DRIVE()Sergei Shtylyov2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: turn selectproc() method into dev_select() method (take 5)Sergei Shtylyov2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: move data register access out of tf_{read|load}() methods (take 2)Sergei Shtylyov2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: call {in|out}put_data() methods from tf_{read|load}() methods (take 2)Sergei Shtylyov2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide-io-std: shorten ide_{in|out}put_data()Sergei Shtylyov2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: rename IDE_TFLAG_IN_[HOB_]FEATURESergei Shtylyov2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: turn set_irq() method into write_devctl() methodSergei Shtylyov2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: use ATA_HOBSergei Shtylyov2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide-disk: use ATA_ERRSergei Shtylyov2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: add support for CFA specified transfer modes (take 3)Sergei Shtylyov2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide-iops: only clear DMA words on setting DMA modeSergei Shtylyov2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: identify data word 53 bit 1 doesn't cover words 62 and 63 (take 3)Sergei Shtylyov2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | au1xxx-ide: auide_{in|out}sw() should be staticSergei Shtylyov2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide-floppy: use ide_pio_bytes()Bartlomiej Zolnierkiewicz2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide-{floppy,tape}: fix padding for PIO transfersBartlomiej Zolnierkiewicz2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: remove CONFIG_BLK_DEV_IDEDOUBLER config optionBartlomiej Zolnierkiewicz2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: decrease size of ->pc_buf field in struct ide_atapi_pcBartlomiej Zolnierkiewicz2009-03-31
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: fix locking in drive_release_dev()Bartlomiej Zolnierkiewicz2009-03-31