UBUNTU: rebase to mainline 6f576d57f1fa0d6026b495d8746d56d949989161

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

diff --git a/debian.master/changelog b/debian.master/changelog
index 4468e9e..5b2457c 100644 (file)
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -4,6 +4,14 @@ linux (2.6.38-5.32) UNRELEASED; urgency=low
   CHANGELOG: Use the printchanges target to see the curent changes.
   CHANGELOG: Use the insertchanges target to create the final log.
 
+  [ Major Kernel Changes ]
+
+  * rebase from v2.6.38-rc5 to v2.6.38-rc6
+    - LP: #718402
+    - LP: #719524
+    - LP: #721126
+    - LP: #719691
+
  -- Andy Whitcroft <apw@canonical.com>  Fri, 18 Feb 2011 15:15:38 +0000
 
 linux (2.6.38-4.31) natty; urgency=low