release 140

3 files changed, 31 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ddc0a511a..c7be324fee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+Summary of changes from v139 to v140
+============================================
+
+Harald Hoyer (1):
+      libvolume_id: bump age
+
+Kay Sievers (12):
+      version bump
+      update TODO
+      volume_id: ntfs - fix uuid setting
+      update TODO
+      rules: Fedora update
+      libudev: queue - use lstat() to check existence of symlink
+      udevadm: settle - add --seq-start= --seq-end=
+      udevd: switch watch symlinks to devpath
+      udevadm: add text for new options to command and man page
+      update TODO
+      libudev: ctrl - return error after sending ctrl message
+      udevadm: settle - use timeout signal, instead of loop counter
+
+Michael Prokop (1):
+      fix compile error in debug mode
+
+Scott James Remnant (1):
+      udevadm: settle - synchronise with the udev daemon
+
+
 Summary of changes from v138 to v139
 ============================================
 
diff --git a/NEWS b/NEWS
index 4d59c95f61..eca93c4d98 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ udev 140
 ========
 Bugfixes.
 
+"udevadm settle" now optionally accepts a range of events to wait for,
+instead of waiting for "all" events.
+
 udev 139
 ========
 Bugfixes.
diff --git a/TODO b/TODO
index 316ec65859..8deff6aaf2 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,5 @@
 
-  o drop modprobe floppy alias, it will be in the module (2.6.30)
+  o drop modprobe floppy alias (SUSE), it will be in the module (2.6.30)
   o drop the DVB shell script rule (2.6.29)
   o remove MMC rules, they got a modalias now (2.6.30)
   o add scsi:t-0x09* to "ch" and remove modprobe rule