From c31f33779c48f4bc1458ba5ea13d1209ef393c83 Mon Sep 17 00:00:00 2001
From: dumerrill <dumerrill@DUMERRILL-DT3.nvidia.com>
Date: Tue, 6 Dec 2016 13:24:03 -0500
Subject: [PATCH] 1.6.4 doc update (part 2)

Former-commit-id: 12404c306175e8b1a5dc445670b561a29c389f45
---
 CHANGE_LOG.TXT                  | 6 +++---
 cub/block/block_load.cuh        | 3 +++
 cub/block/block_store.cuh       | 3 +++
 cub/device/device_histogram.cuh | 4 ----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CHANGE_LOG.TXT b/CHANGE_LOG.TXT
index 64ef118975..a98f0462b4 100644
--- a/CHANGE_LOG.TXT
+++ b/CHANGE_LOG.TXT
@@ -1,13 +1,13 @@
 1.6.4    12/06/2016
     - Updated sm_5x, sm_6x tuning policies for radix sorting (3.5B and 3.4B 
       32b keys/s on TitanX and GTX 1080, respectively)
-    - Remove out-dated VC project files
     - Bug fixes: 
+        - Restore fence work-around for scan (reduce-by-key, etc.) hangs 
+          in CUDA 8.5
         - Issue 65: DeviceSegmentedRadixSort should allow inputs to have 
           pointer-to-const type 
         - Mollify Clang device-side warnings
-        - Restore fence work-around for scan (reduce-by-key, etc.) hangs 
-          in CUDA 8.5
+        - Remove out-dated VC project files
           		  
 //-----------------------------------------------------------------------------
 
diff --git a/cub/block/block_load.cuh b/cub/block/block_load.cuh
index 75987cabcf..3e04331b3b 100644
--- a/cub/block/block_load.cuh
+++ b/cub/block/block_load.cuh
@@ -810,6 +810,7 @@ private:
         /// Shared memory storage layout type
         struct _TempStorage : BlockExchange::TempStorage
         {
+            /// Temporary storage for partially-full block guard
             volatile int valid_items;
         };
 
@@ -889,6 +890,7 @@ private:
         /// Shared memory storage layout type
         struct _TempStorage : BlockExchange::TempStorage
         {
+            /// Temporary storage for partially-full block guard
             volatile int valid_items;
         };
 
@@ -968,6 +970,7 @@ private:
         /// Shared memory storage layout type
         struct _TempStorage : BlockExchange::TempStorage
         {
+            /// Temporary storage for partially-full block guard
             volatile int valid_items;
         };
 
diff --git a/cub/block/block_store.cuh b/cub/block/block_store.cuh
index 2fb252c7e1..84172c2caa 100644
--- a/cub/block/block_store.cuh
+++ b/cub/block/block_store.cuh
@@ -638,6 +638,7 @@ private:
         /// Shared memory storage layout type
         struct _TempStorage : BlockExchange::TempStorage
         {
+            /// Temporary storage for partially-full block guard
             volatile int valid_items;
         };
 
@@ -703,6 +704,7 @@ private:
         /// Shared memory storage layout type
         struct _TempStorage : BlockExchange::TempStorage
         {
+            /// Temporary storage for partially-full block guard
             volatile int valid_items;
         };
 
@@ -768,6 +770,7 @@ private:
         /// Shared memory storage layout type
         struct _TempStorage : BlockExchange::TempStorage
         {
+            /// Temporary storage for partially-full block guard
             volatile int valid_items;
         };
 
diff --git a/cub/device/device_histogram.cuh b/cub/device/device_histogram.cuh
index 00110f5b3c..9a4e099597 100644
--- a/cub/device/device_histogram.cuh
+++ b/cub/device/device_histogram.cuh
@@ -860,10 +860,6 @@ struct DeviceHistogram
     //@}  end member group
 };
 
-/**
- * \example example_device_histogram.cu
- */
-
 }               // CUB namespace
 CUB_NS_POSTFIX  // Optional outer namespace(s)