aboutsummaryrefslogtreecommitdiff
path: root/debian.master/changelog
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2010-06-09 13:12:58 -0700
committerLeann Ogasawara <leann.ogasawara@canonical.com>2010-07-23 11:40:23 +0200
commit2338099cba2c13bddd61911bd907c1957b0e31db (patch)
treef6217016c4bf35a31d68e87936eea3020f5ea802 /debian.master/changelog
parent5d9626d8560f8d063632fa0a05f08478d28c40a6 (diff)
UBUNTU: Ubuntu-2.6.35-2.3
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master/changelog')
-rw-r--r--debian.master/changelog20
1 files changed, 16 insertions, 4 deletions
diff --git a/debian.master/changelog b/debian.master/changelog
index ac06e173aae..52340cf575f 100644
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,8 +1,20 @@
-linux (2.6.35-2.3) UNRELEASED; urgency=low
+linux (2.6.35-2.3) maverick; 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.
+ [ Bryan Wu ]
+
+ * CONFIG: enforce -- make sure we disable CONFIG_LOCALVERSION_AUTO
+
+ [ Leann Ogasawara ]
+
+ * [Config] armel: Enable CONFIG_BNX2=m
+ * [Config] ports: Enable CONFIG_BNX2X=m
+ * SAUCE: armel: define get_dma_ops to fix FTBS
+
+ [ Tim Gardner ]
+
+ * [Upstream] net: Print num_rx_queues imbalance warning only when there
+ are allocated queues
+ - LP: #591416
-- Leann Ogasawara <leann.ogasawara@canonical.com> Wed, 09 Jun 2010 08:27:41 -0700