From 645899ed6ec579854365f45424fb25616c90b818 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Sun, 5 Jul 2009 10:54:49 +0000 Subject: [PATCH] update to 2.6.31-rc2 allmost no conflicts beside one sparc patch, that landed in next and should be soon in linus. svn path=/dists/trunk/linux-2.6/; revision=13868 --- debian/changelog | 4 +++- debian/patches/series/base | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 67651bdda..a62bcae27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -linux-2.6 (2.6.31~rc1-1~experimental.1) UNRELEASED; urgency=low +linux-2.6 (2.6.31~rc2-1~experimental.1) UNRELEASED; urgency=low + + * New upstream release. [ maximilian attems ] * [powerpc64] Enable modular RTC_DRV_PS3, PS3_VRAM. diff --git a/debian/patches/series/base b/debian/patches/series/base index 3aa1adbe6..effae473c 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -24,4 +24,4 @@ + bugfix/powerpc/lpar-console.patch #+ bugfix/all/wireless-regulatory-default-EU.patch #+ features/sparc/video-sunxvr500-intergraph.patch -+ bugfix/sparc/arch-zimage-target.patch +#+ bugfix/sparc/arch-zimage-target.patch