diff --git a/[refs] b/[refs]
index af76e7cdf2ad..1f3c93b03a67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55e9643e6c486b589279576877838ffd8ed04a68
+refs/heads/master: 8f078ca6e7e1a5457aef5196e7154aa468094120
diff --git a/trunk/drivers/staging/hv/ChannelMgmt.h b/trunk/drivers/staging/hv/ChannelMgmt.h
index fa973d86b624..9219199d0e5a 100644
--- a/trunk/drivers/staging/hv/ChannelMgmt.h
+++ b/trunk/drivers/staging/hv/ChannelMgmt.h
@@ -27,7 +27,7 @@
 
 #include <linux/list.h>
 #include <linux/timer.h>
-#include "RingBuffer.h"
+#include "ring_buffer.h"
 #include "VmbusChannelInterface.h"
 #include "VmbusPacketFormat.h"
 
diff --git a/trunk/drivers/staging/hv/Makefile b/trunk/drivers/staging/hv/Makefile
index 91955095f9e8..faa8db1d86c0 100644
--- a/trunk/drivers/staging/hv/Makefile
+++ b/trunk/drivers/staging/hv/Makefile
@@ -6,7 +6,7 @@ obj-$(CONFIG_HYPERV_UTILS)	+= hv_utils.o
 
 hv_vmbus-objs := vmbus_drv.o osd.o \
 		 Vmbus.o hv.o connection.o channel.o \
-		 ChannelMgmt.o ChannelInterface.o RingBuffer.o
+		 ChannelMgmt.o ChannelInterface.o ring_buffer.o
 hv_storvsc-objs := storvsc_drv.o StorVsc.o
 hv_blkvsc-objs := blkvsc_drv.o BlkVsc.o
 hv_netvsc-objs := netvsc_drv.o NetVsc.o RndisFilter.o
diff --git a/trunk/drivers/staging/hv/VmbusPrivate.h b/trunk/drivers/staging/hv/VmbusPrivate.h
index f03db0b6e887..d73baff99a7e 100644
--- a/trunk/drivers/staging/hv/VmbusPrivate.h
+++ b/trunk/drivers/staging/hv/VmbusPrivate.h
@@ -30,7 +30,7 @@
 #include "channel.h"
 #include "ChannelMgmt.h"
 #include "ChannelInterface.h"
-#include "RingBuffer.h"
+#include "ring_buffer.h"
 #include <linux/list.h>
 
 
diff --git a/trunk/drivers/staging/hv/RingBuffer.c b/trunk/drivers/staging/hv/ring_buffer.c
similarity index 99%
rename from trunk/drivers/staging/hv/RingBuffer.c
rename to trunk/drivers/staging/hv/ring_buffer.c
index 64f8d0f9e05c..ae2a10e24d92 100644
--- a/trunk/drivers/staging/hv/RingBuffer.c
+++ b/trunk/drivers/staging/hv/ring_buffer.c
@@ -25,7 +25,7 @@
 #include <linux/mm.h>
 #include "osd.h"
 #include "logging.h"
-#include "RingBuffer.h"
+#include "ring_buffer.h"
 
 
 /* #defines */
diff --git a/trunk/drivers/staging/hv/RingBuffer.h b/trunk/drivers/staging/hv/ring_buffer.h
similarity index 100%
rename from trunk/drivers/staging/hv/RingBuffer.h
rename to trunk/drivers/staging/hv/ring_buffer.h