Merge branch 'kernel39' into next

This commit is contained in:
Arne Fitzenreiter
2011-04-28 18:46:45 +02:00
82 changed files with 98 additions and 102 deletions

View File

@@ -1,6 +1,6 @@
#usr/lib/perl5/site_perl/5.12.3/MIME
usr/lib/perl5/site_perl/5.12.3/MIME/Body.pm
usr/lib/perl5/site_perl/5.12.3/MIME/Decoder
#usr/lib/perl5/site_perl/5.12.3/MIME/Decoder
usr/lib/perl5/site_perl/5.12.3/MIME/Decoder.pm
usr/lib/perl5/site_perl/5.12.3/MIME/Decoder/Base64.pm
usr/lib/perl5/site_perl/5.12.3/MIME/Decoder/BinHex.pm
@@ -24,8 +24,9 @@ usr/lib/perl5/site_perl/5.12.3/MIME/Parser/Results.pm
usr/lib/perl5/site_perl/5.12.3/MIME/Tools.pm
usr/lib/perl5/site_perl/5.12.3/MIME/WordDecoder.pm
usr/lib/perl5/site_perl/5.12.3/MIME/Words.pm
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME-tools
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME-tools/.packlist
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME/tools
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME/tools/.packlist
#usr/share/man/man3/MIME::Body.3
#usr/share/man/man3/MIME::Decoder.3
#usr/share/man/man3/MIME::Decoder::Base64.3

View File

@@ -1 +0,0 @@
../../../common/perl-GD

View File

@@ -94,7 +94,7 @@ lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl1251/wl1251.ko
lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl1251/wl1251_sdio.ko
lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl12xx/wl1271.ko
#lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl12xx/wl1271.ko
lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
lib/modules/2.6.32.28-ipfire/kernel/drivers/ssb/ssb.ko
lib/modules/2.6.32.28-ipfire/kernel/drivers/staging/ath6kl/ath6kl.ko
@@ -208,7 +208,7 @@ lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl1251/wl1251.ko
lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl1251/wl1251_sdio.ko
lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl12xx/wl1271.ko
#lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl12xx/wl1271.ko
lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/ssb/ssb.ko
lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/staging/ath6kl/ath6kl.ko
@@ -322,7 +322,7 @@ lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl1251/wl1251.ko
lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl1251/wl1251_sdio.ko
lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1271.ko
#lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1271.ko
lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/ssb/ssb.ko
lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/staging/ath6kl/ath6kl.ko

View File

@@ -1,3 +1,4 @@
etc/rc.d/init.d/alsa
lib/firmware/aica_firmware.bin
#lib/firmware/asihpi
lib/firmware/asihpi/dsp2400.bin
@@ -45,22 +46,25 @@ lib/firmware/emagic/emi26-bitstream.bin
lib/firmware/emagic/emi26-firmware.bin
lib/firmware/emagic/emi26-loader.bin
lib/firmware/emagic/emi62-bitstream.bin
lib/firmware/emagic/emi62-firmware.bin
lib/firmware/emagic/emi62-firmware-midi.bin
lib/firmware/emagic/emi62-firmware-spdif.bin
lib/firmware/emagic/emi62-firmware.bin
lib/firmware/emagic/emi62-loader.bin
lib/firmware/emagic/license.txt
#lib/firmware/emu
lib/firmware/emu/audio_dock.fw
lib/firmware/emu/emu0404.fw
lib/firmware/emu/emu1010_notebook.fw
lib/firmware/emu/emu1010b.fw
lib/firmware/emu/emu1010_notebook.fw
lib/firmware/emu/hana.fw
lib/firmware/emu/micro_dock.fw
lib/firmware/ess/maestro3_assp_kernel.fw
lib/firmware/ess/maestro3_assp_minisrc.fw
lib/firmware/korg/k1212.dsp
#lib/firmware/mixart
lib/firmware/mixart/miXart8AES.xlx
lib/firmware/mixart/miXart8.elf
lib/firmware/mixart/miXart8.xlx
lib/firmware/mixart/miXart8AES.xlx
lib/firmware/multiface_firmware.bin
lib/firmware/multiface_firmware_rev11.bin
#lib/firmware/pcxhr
@@ -86,6 +90,12 @@ lib/firmware/pcxhr/xlxc882e.dat
lib/firmware/pcxhr/xlxc882hr.dat
lib/firmware/pcxhr/xlxc924.dat
lib/firmware/pcxhr/xlxint.dat
lib/firmware/rpm_firmware.bin
lib/firmware/sb16/alaw_main.csp
lib/firmware/sb16/ima_adpcm_capture.csp
lib/firmware/sb16/ima_adpcm_init.csp
lib/firmware/sb16/ima_adpcm_playback.csp
lib/firmware/sb16/mulaw_main.csp
#lib/firmware/turtlebeach
lib/firmware/turtlebeach/msndinit.bin
lib/firmware/turtlebeach/msndperm.bin
@@ -105,9 +115,15 @@ lib/firmware/vx/x1_1_vp4.xlx
lib/firmware/vx/x1_1_vx2.xlx
lib/firmware/vx/x1_1_vxp.xlx
lib/firmware/vx/x1_2_v22.xlx
lib/firmware/yamaha/ds1_ctrl.fw
lib/firmware/yamaha/ds1_dsp.fw
lib/firmware/yamaha/ds1e_ctrl.fw
lib/firmware/yamaha/yss225_registers.bin
lib/udev/rules.d/90-alsa-restore.rules
usr/bin/aconnect
usr/bin/alsaloop
usr/bin/alsamixer
usr/bin/alsaucm
usr/bin/amidi
usr/bin/amixer
usr/bin/aplay
@@ -124,36 +140,38 @@ usr/bin/speaker-test
#usr/include/alsa/asoundef.h
#usr/include/alsa/asoundlib.h
#usr/include/alsa/conf.h
#usr/include/alsa/control.h
#usr/include/alsa/control_external.h
#usr/include/alsa/control.h
#usr/include/alsa/error.h
#usr/include/alsa/global.h
#usr/include/alsa/hwdep.h
#usr/include/alsa/iatomic.h
#usr/include/alsa/input.h
#usr/include/alsa/mixer.h
#usr/include/alsa/mixer_abst.h
#usr/include/alsa/mixer.h
#usr/include/alsa/output.h
#usr/include/alsa/pcm.h
#usr/include/alsa/pcm_external.h
#usr/include/alsa/pcm_extplug.h
#usr/include/alsa/pcm.h
#usr/include/alsa/pcm_ioplug.h
#usr/include/alsa/pcm_old.h
#usr/include/alsa/pcm_plugin.h
#usr/include/alsa/pcm_rate.h
#usr/include/alsa/rawmidi.h
#usr/include/alsa/seq.h
#usr/include/alsa/seq_event.h
#usr/include/alsa/seq_midi_event.h
#usr/include/alsa/seq.h
#usr/include/alsa/seqmid.h
#usr/include/alsa/seq_midi_event.h
#usr/include/alsa/sound
#usr/include/alsa/sound/asound_fm.h
#usr/include/alsa/sound/emu10k1.h
#usr/include/alsa/sound/hdsp.h
usr/include/alsa/sound/hdspm.h
#usr/include/alsa/sound/sb16_csp.h
#usr/include/alsa/sound/sscape_ioctl.h
#usr/include/alsa/sound/type_compat.h
#usr/include/alsa/timer.h
#usr/include/alsa/use-case.h
#usr/include/alsa/version.h
#usr/include/sys/asoundlib.h
#usr/lib/alsa-lib
@@ -183,11 +201,12 @@ usr/local/share/alsa
#usr/local/share/alsa/firmware/hdsploader/digiface_firmware_rev11.bin
#usr/local/share/alsa/firmware/hdsploader/multiface_firmware.bin
#usr/local/share/alsa/firmware/hdsploader/multiface_firmware_rev11.bin
usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin
#usr/local/share/alsa/firmware/mixartloader
#usr/local/share/alsa/firmware/mixartloader/miXart.conf
#usr/local/share/alsa/firmware/mixartloader/miXart8AES.xlx
#usr/local/share/alsa/firmware/mixartloader/miXart8.elf
#usr/local/share/alsa/firmware/mixartloader/miXart8.xlx
#usr/local/share/alsa/firmware/mixartloader/miXart8AES.xlx
#usr/local/share/alsa/firmware/mixartloader/miXart.conf
#usr/local/share/alsa/firmware/pcxhrloader
#usr/local/share/alsa/firmware/pcxhrloader/b321_512.b56
#usr/local/share/alsa/firmware/pcxhrloader/d321_512.d56
@@ -202,13 +221,13 @@ usr/local/share/alsa
#usr/local/share/alsa/firmware/pcxhrloader/dspe882.e56
#usr/local/share/alsa/firmware/pcxhrloader/dspe924.e56
#usr/local/share/alsa/firmware/pcxhrloader/e321_512.e56
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr0.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr1.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr2.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr3.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr4.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr5.conf
#usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf
#usr/local/share/alsa/firmware/pcxhrloader/xc_1_882.dat
#usr/local/share/alsa/firmware/pcxhrloader/xi_1_882.dat
#usr/local/share/alsa/firmware/pcxhrloader/xlxc1222e.dat
@@ -221,17 +240,17 @@ usr/local/share/alsa
#usr/local/share/alsa/firmware/usx2yloader
#usr/local/share/alsa/firmware/usx2yloader/tascam_loader.ihx
#usr/local/share/alsa/firmware/usx2yloader/us122.conf
#usr/local/share/alsa/firmware/usx2yloader/us122fw.ihx
#usr/local/share/alsa/firmware/usx2yloader/us122.prepad
#usr/local/share/alsa/firmware/usx2yloader/us122.rbt
#usr/local/share/alsa/firmware/usx2yloader/us122fw.ihx
#usr/local/share/alsa/firmware/usx2yloader/us224.conf
#usr/local/share/alsa/firmware/usx2yloader/us224fw.ihx
#usr/local/share/alsa/firmware/usx2yloader/us224.prepad
#usr/local/share/alsa/firmware/usx2yloader/us224.rbt
#usr/local/share/alsa/firmware/usx2yloader/us224fw.ihx
#usr/local/share/alsa/firmware/usx2yloader/us428.conf
#usr/local/share/alsa/firmware/usx2yloader/us428fw.ihx
#usr/local/share/alsa/firmware/usx2yloader/us428.prepad
#usr/local/share/alsa/firmware/usx2yloader/us428.rbt
#usr/local/share/alsa/firmware/usx2yloader/us428fw.ihx
#usr/local/share/alsa/firmware/vxloader
#usr/local/share/alsa/firmware/vxloader/bd56002.boot
#usr/local/share/alsa/firmware/vxloader/bd563s3.boot
@@ -257,19 +276,21 @@ usr/share/alsa
#usr/share/alsa/alsa.conf
#usr/share/alsa/cards
#usr/share/alsa/cards/AACI.conf
#usr/share/alsa/cards/aliases.alisp
#usr/share/alsa/cards/aliases.conf
#usr/share/alsa/cards/ATIIXP.conf
#usr/share/alsa/cards/ATIIXP-MODEM.conf
#usr/share/alsa/cards/ATIIXP-SPDMA.conf
#usr/share/alsa/cards/ATIIXP.conf
#usr/share/alsa/cards/AU8810.conf
#usr/share/alsa/cards/AU8820.conf
#usr/share/alsa/cards/AU8830.conf
#usr/share/alsa/cards/Audigy.conf
#usr/share/alsa/cards/Audigy2.conf
#usr/share/alsa/cards/Audigy.conf
#usr/share/alsa/cards/Aureon51.conf
#usr/share/alsa/cards/Aureon71.conf
#usr/share/alsa/cards/CA0106.conf
#usr/share/alsa/cards/CMI8338-SWIEC.conf
#usr/share/alsa/cards/CMI8338.conf
#usr/share/alsa/cards/CMI8338-SWIEC.conf
#usr/share/alsa/cards/CMI8738-MC6.conf
#usr/share/alsa/cards/CMI8738-MC8.conf
#usr/share/alsa/cards/CMI8788.conf
@@ -284,9 +305,9 @@ usr/share/alsa
#usr/share/alsa/cards/HDA-Intel.conf
#usr/share/alsa/cards/ICE1712.conf
#usr/share/alsa/cards/ICE1724.conf
#usr/share/alsa/cards/ICH-MODEM.conf
#usr/share/alsa/cards/ICH.conf
#usr/share/alsa/cards/ICH4.conf
#usr/share/alsa/cards/ICH.conf
#usr/share/alsa/cards/ICH-MODEM.conf
#usr/share/alsa/cards/Maestro3.conf
#usr/share/alsa/cards/NFORCE.conf
#usr/share/alsa/cards/PC-Speaker.conf
@@ -303,15 +324,13 @@ usr/share/alsa
#usr/share/alsa/cards/TRID4DWAVENX.conf
#usr/share/alsa/cards/USB-Audio.conf
#usr/share/alsa/cards/VIA686A.conf
#usr/share/alsa/cards/VIA8233.conf
#usr/share/alsa/cards/VIA8233A.conf
#usr/share/alsa/cards/VIA8233.conf
#usr/share/alsa/cards/VIA8237.conf
#usr/share/alsa/cards/VX222.conf
#usr/share/alsa/cards/VXPocket.conf
#usr/share/alsa/cards/VXPocket440.conf
#usr/share/alsa/cards/VXPocket.conf
#usr/share/alsa/cards/YMF744.conf
#usr/share/alsa/cards/aliases.alisp
#usr/share/alsa/cards/aliases.conf
#usr/share/alsa/init
#usr/share/alsa/init/00main
#usr/share/alsa/init/default
@@ -341,12 +360,14 @@ usr/share/alsa
#usr/share/alsa/speaker-test
#usr/share/alsa/speaker-test/sample_map.csv
#usr/share/locale/de/LC_MESSAGES/alsa-utils.mo
#usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
#usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo
#usr/share/locale/ja/LC_MESSAGES/alsaconf.mo
#usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
#usr/share/locale/ru/LC_MESSAGES/alsaconf.mo
#usr/share/man/fr/man8/alsaconf.8
#usr/share/man/man1/aconnect.1
#usr/share/man/man1/alsactl.1
#usr/share/man/man1/alsaloop.1
#usr/share/man/man1/alsamixer.1
#usr/share/man/man1/amidi.1
#usr/share/man/man1/amixer.1
@@ -370,15 +391,4 @@ usr/share/sounds/alsa
#usr/share/sounds/alsa/Rear_Right.wav
#usr/share/sounds/alsa/Side_Left.wav
#usr/share/sounds/alsa/Side_Right.wav
etc/rc.d/init.d/alsa
lib/firmware/ess/maestro3_assp_kernel.fw
lib/firmware/ess/maestro3_assp_minisrc.fw
lib/firmware/korg/k1212.dsp
lib/firmware/sb16/alaw_main.csp
lib/firmware/sb16/ima_adpcm_capture.csp
lib/firmware/sb16/ima_adpcm_init.csp
lib/firmware/sb16/ima_adpcm_playback.csp
lib/firmware/sb16/mulaw_main.csp
lib/firmware/yamaha/ds1_ctrl.fw
lib/firmware/yamaha/ds1_dsp.fw
lib/firmware/yamaha/ds1e_ctrl.fw
var/lib/alsa