You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds c9059598ea Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block ... * 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block: (153 commits) block: add request clone interface (v2) floppy: fix hibernation ramdisk: remove long-deprecated "ramdisk=" boot-time parameter fs/bio.c: add missing __user annotation block: prevent possible io_context->refcount overflow Add serial number support for virtio_blk, V4a block: Add missing bounce_pfn stacking and fix comments Revert "block: Fix bounce limit setting in DM" cciss: decode unit attention in SCSI error handling code cciss: Remove no longer needed sendcmd reject processing code cciss: change SCSI error handling routines to work with interrupts enabled. cciss: separate error processing and command retrying code in sendcmd_withirq_core() cciss: factor out fix target status processing code from sendcmd functions cciss: simplify interface of sendcmd() and sendcmd_withirq() cciss: factor out core of sendcmd_withirq() for use by SCSI error handling code cciss: Use schedule_timeout_uninterruptible in SCSI error handling code block: needs to set the residual length of a bidi request Revert "block: implement blkdev_readpages" block: Fix bounce limit setting in DM Removed reference to non-existing file Documentation/PCI/PCI-DMA-mapping.txt ... Manually fix conflicts with tracing updates in: block/blk-sysfs.c drivers/ide/ide-atapi.c drivers/ide/ide-cd.c drivers/ide/ide-floppy.c drivers/ide/ide-tape.c include/trace/events/block.h kernel/trace/blktrace.c		16 years ago
..
Kconfig	…
Makefile	tracing/events: convert block trace points to TRACE_EVENT()	16 years ago
blktrace.c	Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block	16 years ago
ftrace.c	Merge branch 'tracing-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	16 years ago
kmemtrace.c	…
ring_buffer.c	ring-buffer: fix ret in rb_add_time_stamp	16 years ago
ring_buffer_benchmark.c	…
trace.c	Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	16 years ago
trace.h	…
trace_boot.c	…
trace_branch.c	…
trace_clock.c	…
trace_event_profile.c	…
trace_event_types.h	…
trace_events.c	tracing: add protection around module events unload	16 years ago
trace_events_filter.c	…
trace_export.c	…
trace_functions.c	…
trace_functions_graph.c	Merge branch 'tracing-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	16 years ago
trace_hw_branches.c	…
trace_irqsoff.c	…
trace_mmiotrace.c	…
trace_nop.c	…
trace_output.c	tracing: add protection around module events unload	16 years ago
trace_output.h	tracing: add protection around module events unload	16 years ago
trace_power.c	…
trace_printk.c	…
trace_sched_switch.c	…
trace_sched_wakeup.c	…
trace_selftest.c	…
trace_selftest_dynamic.c	…
trace_stack.c	tracing/trace_stack: fix the number of entries in the header	16 years ago
trace_stat.c	…
trace_stat.h	…
trace_syscalls.c	…
trace_sysprof.c	…
trace_workqueue.c	…