From 300edb9b0f98fb3aedf6213448fdd7da5930c89a Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 27 Feb 2016 10:37:42 -0600
Subject: [PATCH] Update ChangeLog

---
 ChangeLog            | 2 ++
 arch                 | 2 +-
 configs              | 2 +-
 include/sys/socket.h | 8 +++++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cf3391ce9e..67caa82148 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11529,4 +11529,6 @@
 	  yet (2016-02-26).
 	* include/nuttx/wireless/ieee802154: Add directory (and dummy header file)
 	  (2016-02-16).
+	* arch/arm/include and src: Rename the imx directories to imx1 to make room
+	  in the namespace for other members of the i.MX family (2016-02-27).
 
diff --git a/arch b/arch
index 1fb2ed39e0..5358eb144d 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 1fb2ed39e08f3ec82e68a16a1bc63dc9e0e6e6d2
+Subproject commit 5358eb144d554cbc1fb95bbdadc2a96acd34a8e3
diff --git a/configs b/configs
index bdb92a1d64..dd60f41b7e 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit bdb92a1d64163ff9a7eb8fe842cf304a553c0f94
+Subproject commit dd60f41b7e7539f4b0aa51a61f4a23713817c270
diff --git a/include/sys/socket.h b/include/sys/socket.h
index 355d1c0d32..1d88cb73ab 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * include/sys/socket.h
  *
- *   Copyright (C) 2007, 2009, 2011, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@
  * the protocol family which will be used for communication.
  */
 
-/* Protocol families */
+/* Supported Protocol Families */
 
 #define PF_UNSPEC      0 /* Protocol family unspecified */
 #define PF_UNIX        1 /* Local communication */
@@ -59,7 +59,9 @@
 #define PF_INET6       3 /* IPv6 Internet protocols */
 #define PF_PACKET      4 /* Low level packet interface */
 
-/* Address families */
+/* Supported Address Families. Opengroup.org requires only AF_UNSPEC,
+ * AF_UNIX, AF_INET and AF_INET6.
+ */
 
 #define AF_UNSPEC      PF_UNSPEC
 #define AF_UNIX        PF_UNIX