UBUNTU: Ubuntu-2.6.38-5.32

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

diff --git a/debian.master/changelog b/debian.master/changelog
index 1d89049..e18e1e3 100644 (file)
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,8 +1,16 @@
-linux (2.6.38-5.32) UNRELEASED; urgency=low
+linux (2.6.38-5.32) 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 ]
+
+  * rebase to mainline 6f576d57f1fa0d6026b495d8746d56d949989161
+  * [Config] updateconfigs following rebase to v2.6.38-rc6
+  * [Config] enable CONFIG_DMAR
+    - LP: #552311
+
+  [ Upstream Kernel Changes ]
+
+  * drm/i915: skip FDI & PCH enabling for DP_A
+    - LP: #561802, #600453, #681877
 
   [ Major Kernel Changes ]
 
@@ -14,7 +22,7 @@ linux (2.6.38-5.32) UNRELEASED; urgency=low
     - LP: #722689
     - LP: #722310
 
- -- Andy Whitcroft <apw@canonical.com>  Fri, 18 Feb 2011 15:15:38 +0000
+ -- Andy Whitcroft <apw@canonical.com>  Tue, 22 Feb 2011 13:28:39 +0000
 
 linux (2.6.38-4.31) natty; urgency=low