aboutsummaryrefslogtreecommitdiffstats
path: root/debian/changelog
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2011-08-09 00:16:15 +0000
committerBen Hutchings <benh@debian.org>2011-08-09 00:16:15 +0000
commit53fd520e231dae4997eb4bbe29934c795573a4c8 (patch)
tree716befa696404410289fa3b1b8d11101c479c14f /debian/changelog
parent028a3e5509092266053aae74722584105e599640 (diff)
downloadkernel_replicant_linux-53fd520e231dae4997eb4bbe29934c795573a4c8.tar.gz
kernel_replicant_linux-53fd520e231dae4997eb4bbe29934c795573a4c8.tar.bz2
kernel_replicant_linux-53fd520e231dae4997eb4bbe29934c795573a4c8.zip
Update to 3.1-rc1
Remove and refresh patches as necessary. Disable aufs; after fixing textual conflicts it turns out to be broken by a VFS change. svn path=/dists/trunk/linux-2.6/; revision=17897
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog9
1 files changed, 4 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 0afd7db55c38..0789a2ada2f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-linux-2.6 (3.0.0-2) UNRELEASED; urgency=low
+linux-2.6 (3.1.0~rc1-1~experimental.1) UNRELEASED; urgency=low
+
+ * New upstream release candidate
[ Aurelien Jarno ]
* Add configuration files for s390x architecture.
@@ -10,10 +12,7 @@ linux-2.6 (3.0.0-2) UNRELEASED; urgency=low
(Closes: #636854):
- Various drivers replaced as for x86 in 2.6.32-10
- pata_macio replaces ide_pmac
-
- [ maximilian attems ]
- * Add stable 3.0.1 including:
- - [SCSI] fix crash in scsi_dispatch_cmd()
+ * aufs: Disable until it is updated for Linux 3.1
[ Jonathan Nieder ]
* perf: do not look at ./config for configuration (Closes: #632923)