aboutsummaryrefslogtreecommitdiffstats
path: root/block
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2009-04-071-0/+1
|\
| * blktrace: fix pdu_len when tracing packet command requestsLi Zefan2009-04-031-0/+1
* | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2009-04-076-137/+169
|\ \
| * | cfq-iosched: don't let idling interfere with pluggingJens Axboe2009-04-071-8/+17
| * | block: remove unused REQ_UNPLUGJens Axboe2009-04-071-2/+0
| * | cfq-iosched: kill two unused cfqq flagsJens Axboe2009-04-071-14/+1
| * | cfq-iosched: change dispatch logic to deal with single requests at the timeJens Axboe2009-04-071-76/+90
| * | block: fix inconsistency in I/O stat accounting codeJerome Marchand2009-04-075-26/+32
| * | block: elevator quiescing helpersJens Axboe2009-04-072-13/+31
* | | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2009-04-071-1/+1
|\ \ \ | |/ / |/| |
| * | pata_artop: typoAlan Cox2009-04-061-1/+1
* | | block: Add flag for telling the IO schedulers NOT to anticipate more IOJens Axboe2009-04-062-1/+5
* | | block: enabling plugging on SSD devices that don't do queuingJens Axboe2009-04-061-2/+11
* | | block: change the request allocation/congestion logic to be sync/async basedJens Axboe2009-04-063-56/+56
|/ /
* | Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2009-04-053-877/+0
|\ \
| * \ Merge branch 'tracing/core-v2' into tracing-for-linusIngo Molnar2009-04-023-877/+0
| |\ \ | | |/
| | * Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'linus' ...Ingo Molnar2009-03-101-16/+9
| | |\
| | * \ Merge branches 'tracing/ftrace' and 'linus' into tracing/coreIngo Molnar2009-02-272-41/+69
| | |\ \
| | * \ \ Merge branch 'linus' into tracing/blktraceIngo Molnar2009-02-193-8/+26
| | |\ \ \
| | * | | | tracing/blktrace: move the tracing file to kernel/traceFrederic Weisbecker2009-02-093-1563/+0
| | * | | | trace: Call tracing_reset_online_cpus before tracer->init()Arnaldo Carvalho de Melo2009-02-061-2/+0
| | * | | | tracing: Introduce trace_buffer_{lock_reserve,unlock_commit}Arnaldo Carvalho de Melo2009-02-061-15/+6
| | * | | | ring_buffer: remove unused flags parameterArnaldo Carvalho de Melo2009-02-061-4/+4
| | * | | | trace: Remove unused trace_array_cpu parameterArnaldo Carvalho de Melo2009-02-051-1/+1
| | * | | | trace: assign defaults at register_ftrace_eventArnaldo Carvalho de Melo2009-02-051-2/+0
| | * | | | trace: make the trace_event callbacks return enum print_line_tArnaldo Carvalho de Melo2009-02-041-2/+4
| | * | | | trace: judicious error checking of trace_seq resultsArnaldo Carvalho de Melo2009-02-041-1/+1
| | * | | | blktrace: fix coding style in recent patchesArnaldo Carvalho de Melo2009-02-031-21/+30
| | * | | | blkftrace: binary tracing, synthesizing old formatArnaldo Carvalho de Melo2009-02-031-3/+37
| | * | | | trace: Change struct trace_event callbacks parameter listArnaldo Carvalho de Melo2009-02-031-4/+4
| | | | | |
| | | \ \ \
| | *-. \ \ \ Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing...Ingo Molnar2009-02-037-102/+202
| | |\ \ \ \ \
| | * | | | | | blktrace: Use tracing_reset_online_cpusArnaldo Carvalho de Melo2009-01-291-6/+1
| | * | | | | | blktrace: the ftrace interface needs CONFIG_TRACINGArnaldo Carvalho de Melo2009-01-271-0/+8
| | * | | | | | tracing/blktrace: fix up checkpatch reported problems in ftrace plugin patchArnaldo Carvalho de Melo2009-01-261-15/+25
| | * | | | | | blktrace: add ftrace pluginArnaldo Carvalho de Melo2009-01-261-5/+646
| | |/ / / / /
* | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumaskLinus Torvalds2009-04-051-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'linus' into cpumask-for-linusIngo Molnar2009-03-305-29/+20
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | cpumask: use topology_core_cpumask/topology_thread_cpumask instead of cpu_cor...Rusty Russell2009-03-131-1/+1
* | | | | | | | Merge branch 'ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2009-04-031-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'x86/core' into core/ipiIngo Molnar2009-03-131-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | | | | | | |
| | | \ \ \ \ \
| | *-. \ \ \ \ \ Merge branches 'x86/apic', 'x86/asm', 'x86/fixmap', 'x86/memtest', 'x86/mm', ...Ingo Molnar2009-03-101-16/+9
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | / | | | | | |_|_|/ | | | | |/| | |
| * | | | | | | Merge branch 'linus' into core/ipiIngo Molnar2009-03-132-44/+65
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | generic-ipi: remove CSD_FLAG_WAITPeter Zijlstra2009-02-251-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm...Linus Torvalds2009-03-281-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2Ingo Molnar2009-03-271-1/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge branch 'x86/core' into core/percpuIngo Molnar2009-03-042-41/+69
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/...Ingo Molnar2009-02-241-1/+1
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | alloc_percpu: add align argument to __alloc_percpu.Rusty Russell2009-02-201-1/+1
| | | | |_|_|/ | | | |/| | |
* | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6Linus Torvalds2009-03-281-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [SCSI] Make scsi.h independent of the rest of the scsi includesJames Bottomley2009-03-121-0/+1
| | |_|/ / / | |/| | | |