aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-06-15 10:47:10 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-08-21 21:54:31 -0600
commita900a85a1d832c17e94e9f76fbbd54203f75b7cd (patch)
tree18dbc7bd1b7a5b6f5c2ffe27312c7b1a1deedfbb /debian.master
parentff3d4b653b54940115d6225a0ef9f4dc6e74050d (diff)
UBUNTU: Ubuntu-3.0-1.2
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master')
-rw-r--r--debian.master/changelog17
1 files changed, 13 insertions, 4 deletions
diff --git a/debian.master/changelog b/debian.master/changelog
index 94b0a183b5c..37b3aa6c9bd 100644
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,8 +1,17 @@
-linux (3.0-1.2) UNRELEASED; urgency=low
+linux (3.0-1.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.
+ [ Andy Whitcroft ]
+
+ * [Config] enable CONFIG_CAN_CALC_BITTIMING
+
+ [ Leann Ogasawara ]
+
+ * rebase to v3.0-rc3
+ * [Config] updateconfigs after rebase to 3.0-rc3
+
+ [ Upstream Kernel Changes ]
+
+ * perf: clear out make flags when calling kernel make kernelver
[ Leann Ogasawara ]