Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block: (38 commits)
  block: don't access jiffies when initialising io_context
  cfq: remove 8 bytes of padding from cfq_rb_root on 64 bit builds
  block: fix for "Consolidate phys_segment and hw_segment limits"
  cfq-iosched: quantum check tweak
  blktrace: perform cleanup after setup error
  blkdev: fix merge_bvec_fn return value checks
  cfq-iosched: requests "in flight" vs "in driver" clarification
  cciss: Fix problem with scatter gather elements in the scsi half of the driver
  cciss: eliminate unnecessary pointer use in cciss scsi code
  cciss: do not use void pointer for scsi hba data
  cciss: factor out scatter gather chain block mapping code
  cciss: fix scatter gather chain block dma direction kludge
  cciss: simplify scatter gather code
  cciss: factor out scatter gather chain block allocation and freeing
  cciss: detect bad alignment of scsi commands at build time
  cciss: clarify command list padding calculation
  cfq-iosched: rethink seeky detection for SSDs
  cfq-iosched: rework seeky detection
  block: remove padding from io_context on 64bit builds
  block: Consolidate phys_segment and hw_segment limits
  ...

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/block/cciss_scsi.h b/drivers/block/cciss_scsi.h
index 7b750245ae76..6d5822fe851a 100644
--- a/drivers/block/cciss_scsi.h
+++ b/drivers/block/cciss_scsi.h
@@ -25,16 +25,16 @@
 
 #include <scsi/scsicam.h> /* possibly irrelevant, since we don't show disks */
 
-                // the scsi id of the adapter...
+                /* the scsi id of the adapter... */
 #define SELF_SCSI_ID 15
-                // 15 is somewhat arbitrary, since the scsi-2 bus
-                // that's presented by the driver to the OS is
-                // fabricated.  The "real" scsi-3 bus the 
-                // hardware presents is fabricated too.
-                // The actual, honest-to-goodness physical
-                // bus that the devices are attached to is not 
-                // addressible natively, and may in fact turn
-                // out to be not scsi at all.
+                /* 15 is somewhat arbitrary, since the scsi-2 bus
+                   that's presented by the driver to the OS is
+                   fabricated.  The "real" scsi-3 bus the
+                   hardware presents is fabricated too.
+                   The actual, honest-to-goodness physical
+                   bus that the devices are attached to is not
+                   addressible natively, and may in fact turn
+                   out to be not scsi at all. */
 
 #define SCSI_CCISS_CAN_QUEUE 2