diff --git a/debian/changelog b/debian/changelog index 68dd09bb5..e24d4359e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,7 @@ -linux-2.6 (3.0.0~rc4-1~experimental.2) UNRELEASED; urgency=low +linux-2.6 (3.0.0~rc5-1~experimental.1) UNRELEASED; urgency=low + + * New upstream release candidate + - fix wrong iput on d_inod. (closes: #631255, #631802) [ maximilian attems ] * [x86] enable some comedi modules. (closes: #631199) diff --git a/debian/patches/bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch b/debian/patches/bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch deleted file mode 100644 index a2536138f..000000000 --- a/debian/patches/bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Hector Oron -Date: Sun, 5 Jun 2011 19:24:09 +0100 -Subject: [PATCH] plat-iop: fixes fail to build from source - - arch/arm/plat-iop/cp6.c:42: error: 'MODE_MASK' undeclared here (not in a function) - arch/arm/plat-iop/cp6.c:43: error: 'SVC_MODE' undeclared here (not in a function) - -Signed-off-by: Hector Oron ---- - arch/arm/plat-iop/cp6.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/arch/arm/plat-iop/cp6.c b/arch/arm/plat-iop/cp6.c -index 9612a87..bab73e2 100644 ---- a/arch/arm/plat-iop/cp6.c -+++ b/arch/arm/plat-iop/cp6.c -@@ -18,6 +18,7 @@ - */ - #include - #include -+#include - - static int cp6_trap(struct pt_regs *regs, unsigned int instr) - { --- -1.7.4.1 - diff --git a/debian/patches/series/base b/debian/patches/series/base index 971a0d3da..f758dff6e 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -42,7 +42,6 @@ + bugfix/all/rt2800-disable-powersaving-as-default.patch + features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch + debian/cgroups-Document-the-Debian-memory-resource-controll.patch -+ bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch + bugfix/mips/mips-i8259-use-struct-syscore_ops-instead-of-sysdevs.patch + bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch + features/all/rt2x00-Add-device-ID-for-RT539F-device.patch