diff options
author | Tim Gardner <tim.gardner@canonical.com> | 2010-07-09 14:57:10 -0600 |
---|---|---|
committer | Tim Gardner <tim.gardner@canonical.com> | 2010-07-09 14:57:10 -0600 |
commit | 428d79cb6f4e364eb3ace0e63141f996c3b01a22 (patch) | |
tree | bc014356c7ba6aa1ac91a3d60e72f2938862d632 | |
parent | 9362352ce90ac91798315b50e6ef49a18bc0ff03 (diff) |
UBUNTU: Ubuntu-2.6.35-7.12Ubuntu-2.6.35-7.12
Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
-rw-r--r-- | debian.master/changelog | 14 |
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 |