summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/ChangeLog.txt2
-rwxr-xr-xnuttx/ChangeLog6
2 files changed, 8 insertions, 0 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index f13d1d4b8..a246f462c 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -1093,3 +1093,5 @@
Makefile for kernel build From Radoslaw Adamczyk (2014-10-23).
* apps/examples/nxterm/Makefile: Update makefile for kernel-build
issues. From Radoslaw Adamczyk (2014-10-23).
+ * apps/examples/keypadtest/keypadtest_main.c: Fixes to keypadtest from
+ Pierre-Noel Bouteville (2014-10-23).
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 4eb2f2ee2..a1f9b3af7 100755
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -8881,3 +8881,9 @@
* nuttx/arch/arm/src/lpc43xx/lpc43_rit.c, lpc43_rit.h, and related
files: Add support for tickless operation using the NXP LPC43xx. From
Brandon Warhurst (2014-10-23).
+ * arch/arm/src/efm32/efm32_gpio.c and efm32_gpioirq.c: EFM32 port and
+ pin decoding backward in every case. From Pierre-Noel Bouteville
+ (2014-10-23).
+ * arch/arm/src/armv7-m/up_itm_syslog.c: Correct file naming and fix
+ compilation errors in up_itm_syslog.c. From Pierre-Noel Bouteville
+ (2014-10-23).