summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPSTREAM-206-commit-todo5
-rw-r--r--UPSTREAM.notes7
2 files changed, 8 insertions, 4 deletions
diff --git a/UPSTREAM-206-commit-todo b/UPSTREAM-206-commit-todo
index 8f82a2298e..7c67b02158 100644
--- a/UPSTREAM-206-commit-todo
+++ b/UPSTREAM-206-commit-todo
@@ -1,4 +1 @@
-The following commits are part of udev-206 and can apply
-to eudev, but havenot yet been integrated:
-
-dd94c17e7da89fa612952119ac825116dc5a8deb
+All commits in upstream's udev-206 have been integrated.
diff --git a/UPSTREAM.notes b/UPSTREAM.notes
index 3da18c28a6..2491441b17 100644
--- a/UPSTREAM.notes
+++ b/UPSTREAM.notes
@@ -1,3 +1,10 @@
+2013-08-02
+
+ * Integrated upstream commit dd94c17e7da89fa612952119ac825116dc5a8deb. No more commits
+ to be considered in UPSTREAM-206-commit-todo.
+ * Fixed UDEV_VERSION. It should have been set to 206 for the 1.2 release.
+
+
2013-08-01
* Prepare 1.2 release. Upstream imports are up to date as of udev-206 release. All commits