aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-01-04 09:07:49 -0700
committerEric Miao <eric.miao@linaro.org>2011-03-07 22:53:11 +0800
commit7377c445da112b55b8a85e1da593dd9688a2c4c6 (patch)
tree7f397996fe1846894f949e9d9ec7d79e029676c6
parent550b282e1dff362e08d86cf3c30816c2ec8025dc (diff)
downloadu-boot-linaro-natty-7377c445da112b55b8a85e1da593dd9688a2c4c6.tar.gz
u-boot-linaro-2010.12-0ubuntu1
Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian/changelog17
1 files changed, 12 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index fd375db3e..8382360a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-u-boot-linaro (2010.12-0ubuntu1) UNRELEASED; urgency=low
-
- * Merge current upstream into packaged branch
-
- -- John Rigby <john.rigby@linaro.org> Wed, 15 Dec 2010 16:02:27 -0700
+u-boot-linaro (2010.12-0ubuntu1) natty; urgency=low
+
+ * Merge upstream v2010.12
+ - LP: 678398
+ - LP: 680095
+ - LP: 680372
+ - LP: 684585
+ * No longer force gcc-4.4
+ - LP: 691220
+ * Remove -Bsymbolic-functions from LDFLAGS in debian/rules
+
+ -- John Rigby <john.rigby@linaro.org> Tue, 04 Jan 2011 09:01:45 -0700
u-boot-linaro (2010.09~rc1.1-0ubuntu6) natty; urgency=low