[kernel] r17839 - in dists/trunk/linux-2.6: . debian debian/config/kernelarch-x86 debian/po

Ben Hutchings benh at alioth.debian.org
Thu Jul 21 21:17:39 UTC 2011 

Author: benh
Date: Thu Jul 21 21:17:37 2011
New Revision: 17839

Log:
Merge changes from sid branch

These are pending for 2.6.39-4, but we will likely upload 3.0.0-1 instead.

Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
   dists/trunk/linux-2.6/debian/po/sk.po

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Jul 21 07:02:13 2011	(r17838)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Jul 21 21:17:37 2011	(r17839)
@@ -13,6 +13,11 @@
   [ Ben Hutchings ]
   * linux-support, linux-tools: Use dh_python2 instead of dh_pysupport
   * aufs: Update for 3.0
+  * [amd64] Enable PCMCIA_AHA152X as module (Closes: #632929)
+  * Update debconf template translations:
+    - Slovak (Slavko)
+  * [x86] comedi: Enable the same drivers as in stable (squeeze), except
+    for ISA drivers on amd64 (Closes: #633516)
 
   [ Arnaud Patard ]
   * Merge ixp4xx build fix and enable ixp4xx back

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Thu Jul 21 07:02:13 2011	(r17838)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Thu Jul 21 21:17:37 2011	(r17839)
@@ -1086,14 +1086,92 @@
 ##
 CONFIG_COMEDI=m
 # CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_MISC_DRIVERS=m
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_BOND=m
+CONFIG_COMEDI_TEST=m
+CONFIG_COMEDI_PARPORT=m
+CONFIG_COMEDI_SERIAL2002=m
 CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_ADDI_APCI_035=m
+CONFIG_COMEDI_ADDI_APCI_1032=m
+CONFIG_COMEDI_ADDI_APCI_1500=m
+CONFIG_COMEDI_ADDI_APCI_1516=m
+CONFIG_COMEDI_ADDI_APCI_1564=m
+CONFIG_COMEDI_ADDI_APCI_16XX=m
+CONFIG_COMEDI_ADDI_APCI_2016=m
+CONFIG_COMEDI_ADDI_APCI_2032=m
+CONFIG_COMEDI_ADDI_APCI_2200=m
+CONFIG_COMEDI_ADDI_APCI_3001=m
+CONFIG_COMEDI_ADDI_APCI_3120=m
+CONFIG_COMEDI_ADDI_APCI_3501=m
+CONFIG_COMEDI_ADDI_APCI_3XXX=m
+CONFIG_COMEDI_ADL_PCI6208=m
+CONFIG_COMEDI_ADL_PCI7296=m
+CONFIG_COMEDI_ADL_PCI7432=m
+CONFIG_COMEDI_ADL_PCI8164=m
+CONFIG_COMEDI_ADL_PCI9111=m
+CONFIG_COMEDI_ADL_PCI9118=m
+CONFIG_COMEDI_ADV_PCI1710=m
+CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI_DIO=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_AMPLC_PC263=m
+CONFIG_COMEDI_AMPLC_PCI224=m
+CONFIG_COMEDI_AMPLC_PCI230=m
+CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_UNIOXX5=m
+CONFIG_COMEDI_GSC_HPDI=m
+CONFIG_COMEDI_ICP_MULTI=m
+CONFIG_COMEDI_II_PCI20KC=m
+CONFIG_COMEDI_DAQBOARD2000=m
+CONFIG_COMEDI_JR3_PCI=m
+CONFIG_COMEDI_KE_COUNTER=m
+CONFIG_COMEDI_CB_PCIDAS64=m
+CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
+CONFIG_COMEDI_CB_PCIDIO=m
+CONFIG_COMEDI_CB_PCIMDAS=m
+CONFIG_COMEDI_CB_PCIMDDA=m
+CONFIG_COMEDI_ME4000=m
+CONFIG_COMEDI_ME_DAQ=m
+CONFIG_COMEDI_NI_6527=m
+CONFIG_COMEDI_NI_65XX=m
+CONFIG_COMEDI_NI_660X=m
+CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_PCIDIO=m
 CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_COMEDI_CB_PCIDAS64=m
+CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
+CONFIG_COMEDI_CB_PCIDIO=m
+CONFIG_COMEDI_CB_PCIMDAS=m
+CONFIG_COMEDI_CB_PCIMDDA=m
+CONFIG_COMEDI_RTD520=m
+CONFIG_COMEDI_S526=m
+CONFIG_COMEDI_S626=m
+CONFIG_COMEDI_SSV_DNP=m
 CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_CB_DAS16_CS=m
+CONFIG_COMEDI_DAS08_CS=m
+CONFIG_COMEDI_NI_DAQ_700_CS=m
+CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
+CONFIG_COMEDI_NI_LABPC_CS=m
+CONFIG_COMEDI_NI_MIO_CS=m
+CONFIG_COMEDI_QUATECH_DAQP_CS=m
 CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_VMK80XX=m
 CONFIG_COMEDI_NI_COMMON=m
 CONFIG_COMEDI_MITE=m
 CONFIG_COMEDI_NI_TIO=m
+CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_DAS08=m
 CONFIG_COMEDI_FC=m
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Thu Jul 21 07:02:13 2011	(r17838)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Thu Jul 21 21:17:37 2011	(r17839)
@@ -347,6 +347,52 @@
 CONFIG_PCMCIA_NINJA_SCSI=m
 
 ##
+## file: drivers/staging/comedi/Kconfig
+##
+CONFIG_COMEDI_ISA_DRIVERS=m
+CONFIG_COMEDI_ACL7225B=m
+CONFIG_COMEDI_PCL711=m
+CONFIG_COMEDI_PCL724=m
+CONFIG_COMEDI_PCL725=m
+CONFIG_COMEDI_PCL726=m
+CONFIG_COMEDI_PCL730=m
+CONFIG_COMEDI_PCL812=m
+CONFIG_COMEDI_PCL816=m
+CONFIG_COMEDI_PCL818=m
+CONFIG_COMEDI_PCM3724=m
+CONFIG_COMEDI_PCM3730=m
+CONFIG_COMEDI_RTI800=m
+CONFIG_COMEDI_RTI802=m
+CONFIG_COMEDI_DAS16M1=m
+CONFIG_COMEDI_DAS16=m
+CONFIG_COMEDI_DAS800=m
+CONFIG_COMEDI_DAS1800=m
+CONFIG_COMEDI_DAS6402=m
+CONFIG_COMEDI_DT2801=m
+CONFIG_COMEDI_DT2811=m
+CONFIG_COMEDI_DT2814=m
+CONFIG_COMEDI_DT2815=m
+CONFIG_COMEDI_DT2817=m
+CONFIG_COMEDI_DT282X=m
+CONFIG_COMEDI_DMM32AT=m
+CONFIG_COMEDI_FL512=m
+CONFIG_COMEDI_AIO_AIO12_8=m
+CONFIG_COMEDI_AIO_IIRO_16=m
+CONFIG_COMEDI_C6XDIGIO=m
+CONFIG_COMEDI_MPC624=m
+CONFIG_COMEDI_ADQ12B=m
+CONFIG_COMEDI_NI_AT_A2150=m
+CONFIG_COMEDI_NI_AT_AO=m
+CONFIG_COMEDI_NI_ATMIO=m
+CONFIG_COMEDI_NI_ATMIO16D=m
+CONFIG_COMEDI_PCMAD=m
+CONFIG_COMEDI_PCMDA12=m
+CONFIG_COMEDI_PCMMIO=m
+CONFIG_COMEDI_PCMUIO=m
+CONFIG_COMEDI_MULTIQ3=m
+CONFIG_COMEDI_POC=m
+
+##
 ## file: drivers/staging/cs5535_gpio/Kconfig
 ##
 CONFIG_CS5535_GPIO=m

Modified: dists/trunk/linux-2.6/debian/po/sk.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/sk.po	Thu Jul 21 07:02:13 2011	(r17838)
+++ dists/trunk/linux-2.6/debian/po/sk.po	Thu Jul 21 21:17:37 2011	(r17839)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-29\n"
 "Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2011-07-04 04:24+0100\n"
-"PO-Revision-Date: 2011-01-02 18:11+0100\n"
+"POT-Creation-Date: 2011-06-09 10:31+0200\n"
+"PO-Revision-Date: 2011-07-10 09:19+0200\n"
 "Last-Translator: Slavko <linux at slavino.sk>\n"
 "Language-Team: Slovak <nomail>\n"
 "Language: sk\n"
@@ -91,8 +91,8 @@
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
 msgstr ""
-"Je veľmi odporúčané prerušiť odstraňovanie jadra, pokiaľ nie ste pripravený "
-"na opravu systému po jeho odstránení."
+"Dôrazne odporúčame prerušiť odstraňovanie jadra, ak nie ste pripravený na "
+"opravu systému po jeho odstránení."
 
 #. Type: note
 #. Description
@@ -130,7 +130,7 @@
 #. Description
 #: ../templates/temp.image.plain/templates:5001
 msgid "Ramdisk configuration must be updated"
-msgstr ""
+msgstr "Nastavenie ramdisku musí byť aktualizované"
 
 #. Type: error
 #. Description
@@ -140,3 +140,7 @@
 "creator package must install a script in /etc/kernel/postinst.d, and you "
 "should remove the line beginning 'ramdisk =' from /etc/kernel-img.conf."
 msgstr ""
+"Balíky jadra už nebudú viac spúšťať vytváranie špecifického ramdisku. "
+"Nástroj na vytváranie ramdisku musí nainštalovať skript do /etc/kernel/"
+"postinst.d a vy musíte odstrániť riadok, ktorý začína „ramdisk =” z /etc/"
+"kernel-img.conf."

More information about the Kernel-svn-changes mailing list