UBUNTU: Ubuntu-2.6.38-10.46

Signed-off-by: Steve Conklin <sconklin@canonical.com>

diff --git a/debian.master/changelog b/debian.master/changelog
index 741e66d..dafbe0e 100644 (file)
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,12 +1,4 @@
-linux (2.6.38-10.46) UNRELEASED; 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.
-
- -- Steve Conklin <sconklin@canonical.com>  Tue, 28 Jun 2011 12:36:29 +0100
-
-linux (2.6.38-10.45) natty-proposed; urgency=low
+linux (2.6.38-10.46) natty-proposed; urgency=low
 
   [ Steve Conklin ]
 
@@ -15,6 +7,15 @@ linux (2.6.38-10.45) natty-proposed; urgency=low
 
   [ Upstream Kernel Changes ]
 
+  * Revert "put stricter guards on queue dead checks"
+  * Revert "fix oops in scsi_run_queue()"
+
+ -- Steve Conklin <sconklin@canonical.com>  Tue, 28 Jun 2011 12:36:29 +0100
+
+linux (2.6.38-10.45) natty-proposed; urgency=low
+
+  [ Upstream Kernel Changes ]
+
   * Revert "af_unix: Only allow recv on connected seqpacket sockets."
 
  -- Steve Conklin <sconklin@canonical.com>  Mon, 27 Jun 2011 12:41:27 +0100