aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-04-12 06:38:49 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-10-17 09:48:16 -0600
commit1ef21c71ab30be6b4f9f6f3892e8fbf653016b61 (patch)
treece05823c3db7e97e8e4f12187a01891e9ecbf4f4
parent8c9ece87ffc63b17028ac35eb87b3d358fae0204 (diff)
UBUNTU: Ubuntu-2.6.39-0.2
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
-rw-r--r--debian.master/changelog33
1 files changed, 29 insertions, 4 deletions
diff --git a/debian.master/changelog b/debian.master/changelog
index cbe1b41f280..7d1bc98d312 100644
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,8 +1,33 @@
-linux (2.6.39-0.2) UNRELEASED; urgency=low
+linux (2.6.39-0.2) oneiric; 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.
+ [ Gustavo F. Padovan ]
+
+ * SAUCE: Revert "Bluetooth: Add new PID for Atheros 3011"
+ - LP: #720949
+
+ [ John Johansen ]
+
+ * AppArmor: Fix masking of capabilities in complain mode
+ - LP: #748656
+
+ [ Leann Ogasawara ]
+
+ * rebase to v2.6.39-rc2
+ * [Config] updateconfigs following rebase to v2.6.39-rc2
+ * hv_mouse needs delay.h
+ * olpc_dcon_xo_1 needs delay.h
+ * olpc_dcon_xo_1_5 needs delay.h
+ * Update dropped.txt for Oneiric
+
+ [ Steve Langasek ]
+
+ * [Config] Make linux-libc-dev coinstallable under multiarch
+ - LP: #750585
+
+ [ Upstream Kernel Changes ]
+
+ * x86, hibernate: Initialize mmu_cr4_features during boot
+ - LP: #752870
[ Major Kernel Changes ]