UBUNTU: Ubuntu-2.6.38-6.34

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian.master/changelog b/debian.master/changelog
index 831d913..5317774 100644 (file)
--- 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