Sync in upstream
diff --git a/ChangeLog b/ChangeLog
index a711308..ec7bc4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
 	  might want it.
 	* src/libusb-glue.c: consequental movement.
 	* src/libmtp.c: reference new flag file.
+	* src/ptp.c: sync in upstream.
+	* src/ptp.h: dito.
 
 2007-10-25  Linus Walleij <triad@df.lth.se>