From c23ad3062276667c3a4b5d346cd0a689f7ee1504 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 23 May 2011 04:30:51 +0000 Subject: [PATCH] Restore patches previously added to 1~experimental.2, for 2.6.39-2 svn path=/dists/trunk/linux-2.6/; revision=17476 --- debian/changelog | 5 +++++ debian/patches/series/{1~experimental.2 => 2} | 0 2 files changed, 5 insertions(+) rename debian/patches/series/{1~experimental.2 => 2} (100%) diff --git a/debian/changelog b/debian/changelog index 42a7b89ab..ce4571023 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ linux-2.6 (2.6.39-2) UNRELEASED; urgency=low [ Ben Hutchings ] * [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA (Closes: #627492) + * cgroups: Disable memory resource controller by default. Allow it + to be enabled using kernel parameter 'cgroup_enable=memory'. + * rt2800usb: Enable support for more USB devices including + Linksys WUSB600N (Closes: #596626) (this change was accidentally + omitted from 2.6.39-1) -- Ben Hutchings Sat, 21 May 2011 22:13:08 +0100 diff --git a/debian/patches/series/1~experimental.2 b/debian/patches/series/2 similarity index 100% rename from debian/patches/series/1~experimental.2 rename to debian/patches/series/2