Merge branch 'bugfixes' into replace-lists

Conflicts:
	ncr-int.h
	ncr.c

1 files changed, 0 insertions, 1 deletions

diff --git a/ncr-int.h b/ncr-int.h
index d8c4912..9b66cbd 100644
--- a/ncr-int.h
+++ b/ncr-int.h
@@ -97,7 +97,6 @@ struct list_sem_st {
  * are here.
  */
 struct ncr_lists {
-	struct list_sem_st data;
 	struct mutex key_idr_mutex;
 	struct idr key_idr;