[kernel] r4941 - in dists/trunk/linux-2.6/debian: . arch patches-debian/series

[Frederik Schüler]

Author: fschueler-guest
Date: Wed Nov 30 12:14:42 2005
New Revision: 4941

Added:
   dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc3-0experimental.1
      - copied unchanged from r4929, dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc2-0experimental.1
Removed:
   dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc2-0experimental.1
Modified:
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/changelog
Log:
Update trunk to 2.6.15-rc3


Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Wed Nov 30 12:14:42 2005
@@ -708,7 +708,6 @@
 CONFIG_SCSI_SATA_SIL24=m
 CONFIG_SCSI_QLA2300=m
 CONFIG_MTD_ONENAND=m
-CONFIG_VIDEO_BT848_DVB=m
 CONFIG_PPP_MPPE=m
 # CONFIG_DEFAULT_CFQ is not set
 CONFIG_SCSI_PDC_ADMA=m
@@ -736,5 +735,6 @@
 CONFIG_UNIX=y
 CONFIG_PACKET_MMAP=y
 CONFIG_MKISS=m
+CONFIG_VIDEO_BT848_DVB=y
 # CONFIG_USB_MIDI is not set
 CONFIG_OBSOLETE_OSS_USB_DRIVER=y

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Nov 30 12:14:42 2005
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.14+2.6.15-rc2-0experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.14+2.6.15-rc3-0experimental.1) UNRELEASED; urgency=low
 
   [ Frederik Schüler ]
   * New upstream release candidate.