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