diff --git a/ChangeLog b/ChangeLog
index 2ac723d871d..32284f93afa 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11076,4 +11076,9 @@
 	  (2015-11-07).
 	* drivers/bch:  Block-to-character (BCH) driver should forward ioctl()
 	  calls to the contained block driver (2015-11-09).
+	* arch/arm/samv7/sam_qspi.c: The QuadSPI driver is now functional
+	  (2015-11-10).
+	* drivers/mtd/s25fl1.c:  The S25FL1xx QuadSPI FLASH driver is now
+	  functional (2015-10-11).
+	* arch/arm/samv7:  Add an on-chip FLASH driver (2015-11-12).
 
diff --git a/arch b/arch
index 24dc5d2231e..8d559bd2329 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 24dc5d2231e14e83abd2fb668e3a0850f7f73fe6
+Subproject commit 8d559bd23293adb14d68d7d6111ecbab40986a5a
diff --git a/include/nuttx/progmem.h b/include/nuttx/progmem.h
index f7a52399ee2..7ba0347da1e 100644
--- a/include/nuttx/progmem.h
+++ b/include/nuttx/progmem.h
@@ -105,7 +105,7 @@ size_t up_progmem_pagesize(size_t page);
  *   Page or negative value on error.  The following errors are reported
  *   (errno is not set!):
  *
- *     EFAULT: On invalid address
+ *     -EFAULT: On invalid address
  *
  ****************************************************************************/
 
@@ -140,12 +140,12 @@ size_t up_progmem_getaddress(size_t page);
  *   Page size or negative value on error.  The following errors are reported
  *   (errno is not set!):
  *
- *     EFAULT: On invalid page
- *     EIO:    On unsuccessful erase
- *     EROFS:  On access to write protected area
- *     EACCES: Insufficient permissions (read/write protected)
- *     EPERM:  If operation is not permitted due to some other constraints
- *             (i.e. some internal block is not running etc.)
+ *     -EFAULT: On invalid page
+ *     -EIO:    On unsuccessful erase
+ *     -EROFS:  On access to write protected area
+ *     -EACCES: Insufficient permissions (read/write protected)
+ *     -EPERM:  If operation is not permitted due to some other constraints
+ *              (i.e. some internal block is not running etc.)
  *
  ****************************************************************************/
 
@@ -161,11 +161,11 @@ ssize_t up_progmem_erasepage(size_t page);
  *    page -
  *
  * Returned Value:
- *   Returns number of bytes written or negative value on error. If it
- *   returns zero then complete page is empty (erased).
+ *   Returns number of bytes NOT erased or negative value on error. If it
+ *   returns zero then complete page is erased.
  *
- *   The following errors are reported (errno is not set!)
- *     EFAULT: On invalid page
+ *   The following errors are reported:
+ *     -EFAULT: On invalid page
  *
  ****************************************************************************/