Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

1 files changed, 13 insertions, 0 deletions

diff --git a/include/uapi/linux/un.h b/include/uapi/linux/un.h
new file mode 100644
index 000000000000..3ed3e46c1b1f
--- /dev/null
+++ b/include/uapi/linux/un.h
@@ -0,0 +1,13 @@
+#ifndef _LINUX_UN_H
+#define _LINUX_UN_H
+
+#include <linux/socket.h>
+
+#define UNIX_PATH_MAX   108
+
+struct sockaddr_un {
+        __kernel_sa_family_t sun_family; /* AF_UNIX */
+        char sun_path[UNIX_PATH_MAX];   /* pathname */
+};
+
+#endif /* _LINUX_UN_H */