linux-stable-rt/block
Linus Torvalds c55d267de2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (170 commits)
  [SCSI] scsi_dh_rdac: Add MD36xxf into device list
  [SCSI] scsi_debug: add consecutive medium errors
  [SCSI] libsas: fix ata list corruption issue
  [SCSI] hpsa: export resettable host attribute
  [SCSI] hpsa: move device attributes to avoid forward declarations
  [SCSI] scsi_debug: Logical Block Provisioning (SBC3r26)
  [SCSI] sd: Logical Block Provisioning update
  [SCSI] Include protection operation in SCSI command trace
  [SCSI] hpsa: fix incorrect PCI IDs and add two new ones (2nd try)
  [SCSI] target: Fix volume size misreporting for volumes > 2TB
  [SCSI] bnx2fc: Broadcom FCoE offload driver
  [SCSI] fcoe: fix broken fcoe interface reset
  [SCSI] fcoe: precedence bug in fcoe_filter_frames()
  [SCSI] libfcoe: Remove stale fcoe-netdev entries
  [SCSI] libfcoe: Move FCOE_MTU definition from fcoe.h to libfcoe.h
  [SCSI] libfc: introduce __fc_fill_fc_hdr that accepts fc_hdr as an argument
  [SCSI] fcoe, libfc: initialize EM anchors list and then update npiv EMs
  [SCSI] Revert "[SCSI] libfc: fix exchange being deleted when the abort itself is timed out"
  [SCSI] libfc: Fixing a memory leak when destroying an interface
  [SCSI] megaraid_sas: Version and Changelog update
  ...

Fix up trivial conflicts due to whitespace differences in
drivers/scsi/libsas/{sas_ata.c,sas_scsi_host.c}
2011-03-17 17:54:40 -07:00
..
Kconfig
Kconfig.iosched
Makefile
blk-cgroup.c
blk-cgroup.h
blk-core.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 2011-03-17 17:54:40 -07:00
blk-exec.c
blk-flush.c block: blk-flush shouldn't call directly into q->request_fn() __blk_run_queue() 2011-03-02 08:48:06 -05:00
blk-integrity.c
blk-ioc.c
blk-iopoll.c
blk-lib.c block: fix mis-synchronisation in blkdev_issue_zeroout() 2011-03-11 15:36:08 +01:00
blk-map.c
blk-merge.c
blk-settings.c
blk-softirq.c
blk-sysfs.c
blk-tag.c
blk-throttle.c blk-throttle: Do not use kblockd workqueue for throtl work 2011-03-01 13:41:53 -05:00
blk-timeout.c
blk.h
bsg.c
cfq-iosched.c block: add @force_kblockd to __blk_run_queue() 2011-03-02 08:48:05 -05:00
cfq.h
compat_ioctl.c
deadline-iosched.c
elevator.c block: add @force_kblockd to __blk_run_queue() 2011-03-02 08:48:05 -05:00
genhd.c
ioctl.c
noop-iosched.c
scsi_ioctl.c