From: LaMont Jones <lamont@debian.org>
Date: Wed, 29 Dec 2010 16:33:45 +0000 (-0700)
Subject: Merge remote branch 'origin/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f9e177060fb5ad6e574598aefdf2d5f50a8b54f;p=util-linux

Merge remote branch 'origin/master'

Conflicts:
	login-utils/Makefile.am
	mount/lomount.c
	text-utils/od.1
---

4f9e177060fb5ad6e574598aefdf2d5f50a8b54f
diff --cc mount/lomount.c
index 00107d67,4d99d9f6..466a0e5e
--- a/mount/lomount.c
+++ b/mount/lomount.c
@@@ -18,8 -18,7 +18,9 @@@
  
  #include "loop.h"
  #include "lomount.h"
 +#include "rmd160.h"
 +#include "xstrncpy.h"
+ #include "strutils.h"
  #include "nls.h"
  #include "sundries.h"
  #include "xmalloc.h"
diff --cc mount/lomount.h
index d24d8b62,de8b76bf..02403518
--- a/mount/lomount.h
+++ b/mount/lomount.h
@@@ -1,5 -1,8 +1,8 @@@
+ #ifndef UTIL_LINUX_LOMOUNT_H
+ #define UTIL_LINUX_LOMOUNT_H
+ 
  extern int set_loop(const char *, const char *, unsigned long long, unsigned long long,
 -		    const char *, int, int *);
 +		    const char *, int, int *, int, int);
  extern int del_loop(const char *);
  extern int is_loop_device(const char *);
  extern int is_loop_autoclear(const char *device);