aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-10-17 03:19:17 -0600
committerJohn Rigby <john.rigby@linaro.org>2011-10-17 09:59:18 -0600
commitfd23f77957e20ff32e6a03e7d09898a68fb69fd6 (patch)
tree19e2629986e2c7a8a9f94dd035b880551702cd26
parentde7c5a8bdd7e1b82379e3d3fa2393ed9dd8ddf33 (diff)
downloadlinux-linaro-fd23f77957e20ff32e6a03e7d09898a68fb69fd6.tar.gz
Linaro: Rebase on new upstreams
commit 051c523bc96d0c6d301fa5258f10d7a564ad43a2 Merge: 78ba622 65c867f Author: Nicolas Pitre <nicolas.pitre@linaro.org> Date: Tue Oct 11 16:31:39 2011 -0400 Merge commit 'v3.0.5' into linaro-3.0 commit e548acb83d07718eb9dcb2c4227f6819fe4d4bad Author: Leann Ogasawara <leann.ogasawara@canonical.com> Date: Fri Oct 7 06:40:17 2011 -0700 UBUNTU: Ubuntu-3.0.0-12.20 Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian.linaro/changelog8
1 files changed, 7 insertions, 1 deletions
diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index e28678ba714..478bcf4f248 100644
--- a/debian.linaro/changelog
+++ b/debian.linaro/changelog
@@ -4,7 +4,13 @@ linux-linaro (3.0.0-1007.12) UNRELEASED; urgency=low
CHANGELOG: Use the printchanges target to see the curent changes.
CHANGELOG: Use the insertchanges target to create the final log.
- -- John Rigby <john.rigby@linaro.org> Mon, 03 Oct 2011 12:36:25 -0600
+ [ John Rigby ]
+
+ * rebase on new upstreams
+ linaro-linux-3.0 commit 051c523bc96d0c6d301fa5258f10d7a564ad43a2
+ Ubuntu UBUNTU: Ubuntu-3.0.0-12.20
+
+ -- John Rigby <john.rigby@linaro.org> Mon, 17 Oct 2011 03:16:27 -0600
linux-linaro (3.0.0-1007.11) natty; urgency=low