Merge branch 'upstream' into tizen

Change-Id: I93d730a6b0596450d95f8f32c947ed20573d3d0a

diff --cc lib/utils_loop.c
index 640d95b,9696a40..681c123
--- 1/lib/utils_loop.c
--- 2/lib/utils_loop.c
+++ b/lib/utils_loop.c
@@@ -28,10 -29,10 +29,13 @@@
  #include <sys/ioctl.h>
  #include <sys/stat.h>
  #include <sys/types.h>
+ #ifdef HAVE_SYS_SYSMACROS_H
+ # include <sys/sysmacros.h>     /* for major, minor */
+ #endif
  #include <linux/loop.h>
 +#ifdef HAVE_SYS_SYSMACROS_H
 +#include <sys/sysmacros.h>     /* for major, minor */
 +#endif
  
  #include "utils_loop.h"