From ea9ca8cdb77d9c173b7955f96afa158106d107a1 Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Sat, 26 Jan 2008 16:07:30 -0600
Subject: [PATCH] --- yaml --- r: 80579 b: refs/heads/master c:
 de15c2017ccbc88c43403a52dd90376d577ef637 h: refs/heads/master i:   80577:
 b64d61b6bfb16e47a61b9e30f8c72f0f7a69b4d4   80575:
 9c68d8b16a6b71762b006751b521c4e301362b29 v: v3

---
 [refs]                                      | 2 +-
 trunk/Documentation/DocBook/kernel-api.tmpl | 8 +-------
 trunk/drivers/base/class.c                  | 2 +-
 trunk/drivers/scsi/sym53c8xx_2/sym_glue.c   | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 44c2ae4f0555..5bd5dbb2757a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caf03feb61bc47dda6dca69a2abb1f5d57dc681e
+refs/heads/master: de15c2017ccbc88c43403a52dd90376d577ef637
diff --git a/trunk/Documentation/DocBook/kernel-api.tmpl b/trunk/Documentation/DocBook/kernel-api.tmpl
index 77436d735013..aa38cc5692a0 100644
--- a/trunk/Documentation/DocBook/kernel-api.tmpl
+++ b/trunk/Documentation/DocBook/kernel-api.tmpl
@@ -419,13 +419,7 @@ X!Edrivers/pnp/system.c
 
   <chapter id="blkdev">
      <title>Block Devices</title>
-!Eblock/blk-core.c
-!Eblock/blk-map.c
-!Iblock/blk-sysfs.c
-!Eblock/blk-settings.c
-!Eblock/blk-exec.c
-!Eblock/blk-barrier.c
-!Eblock/blk-tag.c
+!Eblock/ll_rw_blk.c
   </chapter>
 
   <chapter id="chrdev">
diff --git a/trunk/drivers/base/class.c b/trunk/drivers/base/class.c
index 412fd9a05573..59cf35894cfc 100644
--- a/trunk/drivers/base/class.c
+++ b/trunk/drivers/base/class.c
@@ -863,7 +863,7 @@ EXPORT_SYMBOL_GPL(class_for_each_device);
  * The callback should return 0 if the device doesn't match and non-zero
  * if it does.  If the callback returns non-zero, this function will
  * return to the caller and not iterate over any more devices.
- *
+
  * Note, you will need to drop the reference with put_device() after use.
  *
  * We hold class->sem in this function, so it can not be
diff --git a/trunk/drivers/scsi/sym53c8xx_2/sym_glue.c b/trunk/drivers/scsi/sym53c8xx_2/sym_glue.c
index 21e926dcdab0..e939f3813233 100644
--- a/trunk/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/trunk/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -207,7 +207,7 @@ void sym_set_cam_result_error(struct sym_hcb *np, struct sym_ccb *cp, int resid)
 			/*
 			 *  Bounce back the sense data to user.
 			 */
-			memset(&cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
+			memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
 			memcpy(cmd->sense_buffer, cp->sns_bbuf,
 			       min(SCSI_SENSE_BUFFERSIZE, SYM_SNS_BBUF_LEN));
 #if 0