diff --git a/[refs] b/[refs]
index 573da0f8abad..9fbd882f0694 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eee0f252c6537da2e883f75d22cff1427515eaf3
+refs/heads/master: 5be7ef002469eaf757065ee16b4100c6d3ead1cc
diff --git a/trunk/drivers/scsi/scsi_proc.c b/trunk/drivers/scsi/scsi_proc.c
index f46855cd853d..ad747dc337da 100644
--- a/trunk/drivers/scsi/scsi_proc.c
+++ b/trunk/drivers/scsi/scsi_proc.c
@@ -381,11 +381,6 @@ static ssize_t proc_scsi_write(struct file *file, const char __user *buf,
 	return err;
 }
 
-/**
- * proc_scsi_show - show contents of /proc/scsi/scsi (attached devices)
- * @s: output goes here
- * @p: not used
- */
 static int always_match(struct device *dev, void *data)
 {
 	return 1;