original_kernel/Documentation/ABI/testing
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
2009-06-11 11:10:35 -07:00
..
debugfs-kmemtrace kmemtrace: Fix typos in documentation. 2008-12-29 15:34:09 +02:00
debugfs-pktcdvd doc: use correct debugfs mountpoint 2009-04-13 15:04:33 -07:00
ima_policy integrity: IMA policy 2009-02-06 09:05:31 +11:00
procfs-diskstats
sysfs-block block: Export I/O topology for block devices and partitions 2009-05-22 23:22:55 +02:00
sysfs-bus-css
sysfs-bus-pci PCI: Introduce /sys/bus/pci/devices/.../rescan 2009-03-20 14:59:07 -07:00
sysfs-bus-pci-devices-cciss cciss: add cciss driver sysfs entries 2009-06-02 14:48:39 +02:00
sysfs-bus-umc
sysfs-bus-usb
sysfs-bus-usb-devices-usbsevseg
sysfs-c2port Add c2 port support 2008-11-12 17:17:18 -08:00
sysfs-class
sysfs-class-bdi
sysfs-class-pktcdvd
sysfs-class-regulator regulator: add get_status() 2009-03-31 09:56:20 +01:00
sysfs-class-usb_host
sysfs-class-uwb_rc uwb: add basic radio manager 2008-11-19 14:46:33 +00:00
sysfs-dev
sysfs-devices
sysfs-devices-cache_disable x86/docs: add description for cache_disable sysfs interface 2009-04-10 14:22:40 +02:00
sysfs-devices-memory mm: show node to memory section relationship with symlinks in sysfs 2009-01-06 15:59:00 -08:00
sysfs-firmware-acpi ACPI: add /sys/firmware/acpi/interrupts/sci_not counter 2009-04-21 00:35:47 -04:00
sysfs-firmware-memmap Bernhard has moved 2009-02-18 15:37:56 -08:00
sysfs-firmware-sgi_uv
sysfs-fs-ext4 ext4: Add sysfs support 2009-03-31 09:10:09 -04:00
sysfs-gpio
sysfs-ibft
sysfs-kernel-mm
sysfs-kernel-mm-hugepages
sysfs-kernel-slab slub: add Documentation/ABI/testing/sysfs-kernel-slab 2009-04-28 14:30:35 +03:00
sysfs-kernel-uids
sysfs-ocfs2
sysfs-power
sysfs-profiling
sysfs-wusb_cbaf