Add changelog for additional upstream deltas

diff --git a/debian/changelog b/debian/changelog
index 7b1f3de4ec4c8160d986b0118f45a5ca3f358f0f..8552bfb73ebdf4117a10fd6a3d1ed6bd7a0b0203 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ openafs (1.6.0~pre4-1) UNRELEASED; urgency=low
     - Document current client setuid behavior.  (Closes: #612608)
     - Allow salvager to be run manually with demand-attach servers.
     - Properly report setpag() errors.
+  * Apply upstream deltas:
+    - [1e322b88] Linux: 2.6.39: deal with BKL removal
+    - [a8aa6f42] Linux: 2.6.39: replace path_lookup with kern_path
   * Declare optional dependencies in the openafs-client init script on
     openafs-fileserver so that, if the same host is running both a
     fileserver and a client, the fileserver starts before and stops after