aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@canonical.com>2011-03-08 11:56:07 +0000
committerJohn Rigby <john.rigby@linaro.org>2011-03-16 16:00:47 -0600
commit7adbb8bae174e7b1cb1d6289fc21b00b287e3885 (patch)
tree336ce1640c84abe6461a60b5a2a01f04c4b7838d
parent10cefd15c64613e7ba887699116d908c00258b7e (diff)
UBUNTU: Ubuntu-2.6.38-6.34
Signed-off-by: Andy Whitcroft <apw@canonical.com>
-rw-r--r--debian.master/changelog13
1 files changed, 8 insertions, 5 deletions
diff --git a/debian.master/changelog b/debian.master/changelog
index 831d91331350..53177747031f 100644
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,15 +1,18 @@
-linux (2.6.38-6.34) UNRELEASED; urgency=low
+linux (2.6.38-6.34) natty; 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 ]
+
+ * [Config] normalise CONFIG_INTEL_TXT
+ * SAUCE: KLUDGE: work around failed 'shrink-wrap' compiler optimisation
+ - LP: #730860
+ * rebase to mainline v2.6.38-rc8
[ Major Kernel Changes ]
* rebase from v2.6.38-rc7 + fb62c00a6d8942775abc23d1621db1252e2d93d1
to v2.6.38-rc8
- -- Andy Whitcroft <apw@canonical.com> Tue, 08 Mar 2011 11:24:59 +0000
+ -- Andy Whitcroft <apw@canonical.com> Tue, 08 Mar 2011 11:54:48 +0000
linux (2.6.38-6.33) natty; urgency=low