Add changelog entries for upstream cherry-picks

diff --git a/debian/changelog b/debian/changelog
index ee326ed685b04bd4cf1a5e78490f079f288b8b83..0acb6cfd0649142534a2cfc5a0b00f6b0b57c942 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+openafs (1.4.12+dfsg-2) UNRELEASED; urgency=low
+
+  * Apply upstream deltas:
+    - [4ca7b6fc] Remove lih_r
+    - [f3899ac3] Allow GetSomeSpace_r to select an optimal host
+    - [94a43966] h_TossStuff_r: check held-ness after lock
+    - [b78eeb0c] h_TossStuff_r: make sure host does not go away
+    - [0583af32] volmonitor copy link before calling free
+    - [eb799d07] Move non-executable stack assembly code to end of file
+
+ -- Russ Allbery <rra@debian.org>  Mon, 22 Mar 2010 15:38:05 -0700
+
 openafs (1.4.12+dfsg-1) unstable; urgency=low
 
   * New upstream release.