aboutsummaryrefslogtreecommitdiff
path: root/debian.master/changelog
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2010-07-09 14:57:10 -0600
committerLeann Ogasawara <leann.ogasawara@canonical.com>2010-08-11 07:42:15 -0700
commite9e0241eab40433d9232dac5fb4127c0f33ad7e4 (patch)
tree2ac9327d85db3a2106eddc290467e5b16cca4ae8 /debian.master/changelog
parentce83ce0463203d186f96bdfa7047c219d053901a (diff)
UBUNTU: Ubuntu-2.6.35-7.12
Ignore: yes Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'debian.master/changelog')
-rw-r--r--debian.master/changelog14
1 files changed, 10 insertions, 4 deletions
diff --git a/debian.master/changelog b/debian.master/changelog
index cba37972e58..42fba89789e 100644
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,8 +1,14 @@
-linux (2.6.35-7.12) UNRELEASED; urgency=low
+linux (2.6.35-7.12) 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.
+ [ Tim Gardner ]
+
+ * [Upstream] i915: Use the correct mask to detect i830 aperture size.
+ - LP: #597075
+
+ [ Upstream Kernel Changes ]
+
+ * (drop after 2.6.35) drm/radeon/kms: add ioport register access
+ (squashed)
-- Tim Gardner <tim.gardner@canonical.com> Thu, 08 Jul 2010 09:53:13 -0600