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
This commit is contained in:
Maximilian Attems 2009-07-05 10:54:49 +00:00
parent 7b5f8f8017
commit 645899ed6e
2 changed files with 4 additions and 2 deletions

4
debian/changelog vendored
View File

@ -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.

View File

@ -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