summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tracing/core-v2' into tracing-for-linusIngo Molnar2009-04-022-4/+3
|\
| * Merge branches 'tracing/ftrace', 'tracing/kprobes', 'tracing/tasks' and 'linu...Ingo Molnar2009-03-2059-13043/+940
| |\
| * \ Merge branches 'tracing/ftrace' and 'linus' into tracing/coreIngo Molnar2009-03-1842-3524/+11329
| |\ \
| * \ \ Merge branches 'tracing/ftrace', 'tracing/syscalls' and 'linus' into tracing/...Ingo Molnar2009-03-1642-668/+709
| |\ \ \
| * \ \ \ Merge branch 'core/locking' into tracing/ftraceIngo Molnar2009-03-1338-120/+278
| |\ \ \ \
| * \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/textedit' and 'linus' into tracing/...Ingo Molnar2009-03-1019-68/+119
| |\ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *-. \ \ \ \ \ Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'linus' ...Ingo Molnar2009-03-1034-184/+685
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'x86/core' into tracing/texteditIngo Molnar2009-03-0633-189/+336
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/coreIngo Molnar2009-03-0468-388/+777
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/mmiotrace' and 'linus' into tracing...Ingo Molnar2009-03-0246-211/+498
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace' and 'linus' into tracing/coreIngo Molnar2009-02-2729-144/+354
| |\ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'linus' into...Ingo Molnar2009-02-26101-337/+8740
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/coreIngo Molnar2009-02-2453-300/+617
| |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branches 'tracing/function-graph-tracer' and 'linus' into tracing/coreIngo Molnar2009-02-206-6/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'linus' into tracing/blktraceIngo Molnar2009-02-1965-312/+914
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2009-02-1518-8889/+8753
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 't...Ingo Molnar2009-02-1325-107/+186
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2009-02-1037-1293/+5471
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'v2.6.29-rc4' into tracing/coreIngo Molnar2009-02-0958-1168/+1000
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | ring_buffer: remove unused flags parameter, fixIngo Molnar2009-02-061-3/+2
| * | | | | | | | | | | | | | | | | | | Merge branches 'tracing/ftrace' and 'linus' into tracing/coreIngo Molnar2009-02-0532-98/+260
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing...Ingo Molnar2009-02-03395-2721/+14082
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/coreIngo Molnar2009-01-18284-2534/+9368
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'v2.6.29-rc1' into tracing/urgentIngo Molnar2009-01-111955-50659/+540001
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'linus' into tracing/kmemtrace2Ingo Molnar2009-01-06431-11789/+18269
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'linus' into tracing/kmemtraceIngo Molnar2008-12-31657-19874/+82905
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/docs', 'tracing/function-graph-tracer' and 'linus' in...Ingo Molnar2008-12-29966-41267/+62200
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | sysrq: fix ftrace help msg & doc.Randy Dunlap2008-12-261-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds2009-04-0148-1293/+810
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide-floppy: do not complete rq's prematurelyBorislav Petkov2009-03-311-7/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: be able to build pmac driver without IDE built-inGilles Espinasse2009-03-311-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide-pmac: IDE cable detection on Apple PowerBookTOMARI Hisanobu2009-03-311-2/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: inline SELECT_DRIVE()Sergei Shtylyov2009-03-316-20/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: turn selectproc() method into dev_select() method (take 5)Sergei Shtylyov2009-03-3116-45/+136
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: move data register access out of tf_{read|load}() methods (take 2)Sergei Shtylyov2009-03-319-100/+17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: call {in|out}put_data() methods from tf_{read|load}() methods (take 2)Sergei Shtylyov2009-03-317-48/+52
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide-io-std: shorten ide_{in|out}put_data()Sergei Shtylyov2009-03-311-32/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: rename IDE_TFLAG_IN_[HOB_]FEATURESergei Shtylyov2009-03-318-59/+57
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: turn set_irq() method into write_devctl() methodSergei Shtylyov2009-03-3118-68/+30
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: use ATA_HOBSergei Shtylyov2009-03-317-14/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide-disk: use ATA_ERRSergei Shtylyov2009-03-311-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: add support for CFA specified transfer modes (take 3)Sergei Shtylyov2009-03-315-10/+40
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide-iops: only clear DMA words on setting DMA modeSergei Shtylyov2009-03-311-3/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: identify data word 53 bit 1 doesn't cover words 62 and 63 (take 3)Sergei Shtylyov2009-03-314-26/+19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | au1xxx-ide: auide_{in|out}sw() should be staticSergei Shtylyov2009-03-311-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide-floppy: use ide_pio_bytes()Bartlomiej Zolnierkiewicz2009-03-312-71/+21
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide-{floppy,tape}: fix padding for PIO transfersBartlomiej Zolnierkiewicz2009-03-312-54/+35
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: remove CONFIG_BLK_DEV_IDEDOUBLER config optionBartlomiej Zolnierkiewicz2009-03-312-26/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: decrease size of ->pc_buf field in struct ide_atapi_pcBartlomiej Zolnierkiewicz2009-03-313-2/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ide: fix locking in drive_release_dev()Bartlomiej Zolnierkiewicz2009-03-311-8/+4