From 4e3b7e3358d6ac6c9797817aae429c323040b93d Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 10 Dec 2015 06:33:14 -0600
Subject: [PATCH] Update ChangeLog

---
 ChangeLog | 4 ++++
 arch      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ad625c0ffa..c9407d6344 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11229,4 +11229,8 @@
 	  Telnet sessions (2015-12-07).
 	* arch/arm/src/samv7: In USBHS device driver, fix check if zero length
 	  packet is needed (2015-12-08).
+	* sched/pthread/: CRITICAL BUGFIX: Logic was wiping out the indication
+	  that of the type of a pthread.  Hence, it could be confused as a
+	  task.  Same problem as fixed on 2015-11-29, but in different location
+	  (2015-12-09).
 
diff --git a/arch b/arch
index b025eeaa21..c8448d662d 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit b025eeaa21ef4cf9e1fc0279183b02d45790bb7f
+Subproject commit c8448d662d63fecbbd8c603ab54cfbe2de200fe1