From 7a3db4b500558c599154d5407aa3c80e28d18af6 Mon Sep 17 00:00:00 2001
From: Mike Miller <mike.miller@hp.com>
Date: Wed, 6 Dec 2006 20:34:58 -0800
Subject: [PATCH] --- yaml --- r: 42743 b: refs/heads/master c:
 9d827c9e8a9d8592167ac3fdc3a50544c86302b1 h: refs/heads/master i:   42741:
 ee44af804f8c124aee1fa205673b47615662d58b   42739:
 999d228d716bc7ac48749270fd1ed1d77def9567   42735:
 37f0b28261c608211532555fe1d89ca76884252f v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/block/cciss.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 542784bb0e62..e97425ae76bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eef88d16a2cb641d9915bfdf6377e70fccec9fde
+refs/heads/master: 9d827c9e8a9d8592167ac3fdc3a50544c86302b1
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 4105c3bf3476..0af6f356fba5 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -47,14 +47,15 @@
 #include <linux/completion.h>
 
 #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))
-#define DRIVER_NAME "HP CISS Driver (v 3.6.10)"
-#define DRIVER_VERSION CCISS_DRIVER_VERSION(3,6,10)
+#define DRIVER_NAME "HP CISS Driver (v 3.6.14)"
+#define DRIVER_VERSION CCISS_DRIVER_VERSION(3,6,14)
 
 /* Embedded module documentation macros - see modules.h */
 MODULE_AUTHOR("Hewlett-Packard Company");
-MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 3.6.10");
+MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 3.6.14");
 MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400"
 			" SA6i P600 P800 P400 P400i E200 E200i E500");
+MODULE_VERSION("3.6.14");
 MODULE_LICENSE("GPL");
 
 #include "cciss_cmd.h"