[kernel] r5241 - in people/waldi/linux-2.6: . debian debian/arch/ia64

[Bastian Blank]

Author: waldi
Date: Wed Jan  4 19:25:41 2006
New Revision: 5241

Modified:
   people/waldi/linux-2.6/   (props changed)
   people/waldi/linux-2.6/debian/arch/ia64/config
   people/waldi/linux-2.6/debian/changelog
Log:
Merge /dists/trunk/linux-2.6.


Modified: people/waldi/linux-2.6/debian/arch/ia64/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/ia64/config	(original)
+++ people/waldi/linux-2.6/debian/arch/ia64/config	Wed Jan  4 19:25:41 2006
@@ -422,7 +422,6 @@
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_HMAC_NONE=y
 # CONFIG_ATM is not set
 CONFIG_BRIDGE=m
 CONFIG_DECNET=m

Modified: people/waldi/linux-2.6/debian/changelog
==============================================================================
--- people/waldi/linux-2.6/debian/changelog	(original)
+++ people/waldi/linux-2.6/debian/changelog	Wed Jan  4 19:25:41 2006
@@ -1,9 +1,12 @@
-linux-2.6 (2.6.15-2) unstable; urgency=low
+linux-2.6 (2.6.15-2) UNRELEASED; urgency=low
 
   [ maximilian attems ]
   * Default to initramfs-tools as initramfs generator.
 
- -- maximilian attems <maks at sternwelten.at>  Tue,  3 Jan 2006 16:28:30 +0100
+  [ dann frazier ]
+  * [ia64] Update config for 2.6.15.
+
+ -- dann frazier <dannf at debian.org>  Tue,  3 Jan 2006 21:46:44 -0700
 
 linux-2.6 (2.6.15-1) unstable; urgency=low