diff --git a/nightly/bin/nightly b/nightly/bin/nightly
index b20ce2894..5e85a13e0 100755
--- a/nightly/bin/nightly
+++ b/nightly/bin/nightly
@@ -99,7 +99,7 @@ if [ "${svn_old_rev}" = "${svn_new_rev}" ]; then
   exit 0
 fi
 
-# Do everything twice -- once for the 24 hours old SCST, and once 
+# Do everything twice -- once for the 24 hours old SCST, and once
 # for the current one.
 for logfile in old new ; do
 
diff --git a/scst/include/scst.h b/scst/include/scst.h
index 68b043578..d6c0bc901 100644
--- a/scst/include/scst.h
+++ b/scst/include/scst.h
@@ -3079,7 +3079,7 @@ int scst_obtain_device_parameters(struct scst_device *dev);
 /*
  * Has to be put here open coded, because Linux doesn't have equivalent, which
  * allows exclusive wake ups of threads in LIFO order. We need it to let (yet)
- * unneeded threads sleep and not pollute CPU cache by their stacks. 
+ * unneeded threads sleep and not pollute CPU cache by their stacks.
  */
 static inline void add_wait_queue_exclusive_head(wait_queue_head_t *q,
 	wait_queue_t *wait)
diff --git a/scst_local/scst_local.c b/scst_local/scst_local.c
index 45c32b282..09c6a2ae1 100644
--- a/scst_local/scst_local.c
+++ b/scst_local/scst_local.c
@@ -516,7 +516,7 @@ static int scst_local_queuecommand(struct scsi_cmnd *SCpnt,
 
 	/*
 	 * Get some memory to keep track of the cmnd and the done routine
-	 */ 
+	 */
 	tgt_specific = kmem_cache_alloc(tgt_specific_pool, GFP_ATOMIC);
 	if (!tgt_specific) {
 		printk(KERN_ERR "%s out of memory at line %d\n",
@@ -538,15 +538,15 @@ static int scst_local_queuecommand(struct scsi_cmnd *SCpnt,
 	} else {
 		/*
  		 * Build a one-element scatter list out of the buffer
- 		 * We will not even get here if the kernel version we 
+ 		 * We will not even get here if the kernel version we
  		 * are building on only supports scatterlists. See #if above.
  		 *
  		 * We use the sglist and bufflen function/macros to isolate
  		 * us from kernel version differences.
  		 */
 		if (scsi_sglist(SCpnt)) {
-			sg_init_one(&(tgt_specific->sgl), 
-				(const void *)scsi_sglist(SCpnt), 
+			sg_init_one(&(tgt_specific->sgl),
+				(const void *)scsi_sglist(SCpnt),
 				scsi_bufflen(SCpnt));
 			sgl	  = &(tgt_specific->sgl);
 			sgl_count = 1;