Merge branch 'bugfixes'

Conflicts:
	ncr-int.h

1 files changed, 1 insertions, 1 deletions

diff --git a/ncr-int.h b/ncr-int.h
index 008a89b..84bca9e 100644
--- a/ncr-int.h
+++ b/ncr-int.h
@@ -48,7 +48,7 @@ struct session_item_st {
 	struct page **pages;
 	unsigned array_size;
 	unsigned available_pages;
-	struct semaphore mem_mutex; /* down when the
+	struct mutex mem_mutex; /* down when the
 		* values above are changed.
 		*/