aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-10-26 09:07:20 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:51:27 -0700
commitee6008effabe423672c5aa464da23c3a34e1fa45 (patch)
tree37a56581ca6e74ca93bcf031846dcb3b25a54d08 /debian.master
parent13c3c4e3df4683ee37f5cd98c1ac2ca7d149d745 (diff)
downloadlinux-linaro-precise-ee6008effabe423672c5aa464da23c3a34e1fa45.tar.gz
UBUNTU: Ubuntu-3.1.0-2.2
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master')
-rw-r--r--debian.master/changelog12
1 files changed, 8 insertions, 4 deletions
diff --git a/debian.master/changelog b/debian.master/changelog
index 6f867472a5e..10bebe263a9 100644
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,8 +1,12 @@
-linux (3.1.0-2.2) UNRELEASED; urgency=low
+linux (3.1.0-2.2) precise; urgency=low
- CHANGELOG: Do not edit directly. Autogenerated at release.
- CHANGELOG: Use the printchanges target to see the curent changes.
- CHANGELOG: Use the insertchanges target to create the final log.
+ [ Andy Whitcroft ]
+
+ * debian: add locking to protect debian/files from parallel update
+
+ [ Leann Ogasawara ]
+
+ * rebase to v3.1
[ Upstream Kernel Changes ]