Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Showing
- Documentation/sound/alsa/ALSA-Configuration.txt 20 additions, 9 deletionsDocumentation/sound/alsa/ALSA-Configuration.txt
- Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl 15 additions, 41 deletionsDocumentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
- drivers/char/rtc.c 38 additions, 27 deletionsdrivers/char/rtc.c
- include/sound/ac97_codec.h 0 additions, 10 deletionsinclude/sound/ac97_codec.h
- include/sound/core.h 14 additions, 80 deletionsinclude/sound/core.h
- include/sound/driver.h 0 additions, 17 deletionsinclude/sound/driver.h
- include/sound/emu10k1.h 2 additions, 1 deletioninclude/sound/emu10k1.h
- include/sound/minors.h 3 additions, 5 deletionsinclude/sound/minors.h
- include/sound/pcm.h 1 addition, 2 deletionsinclude/sound/pcm.h
- include/sound/timer.h 1 addition, 0 deletionsinclude/sound/timer.h
- include/sound/version.h 2 additions, 2 deletionsinclude/sound/version.h
- sound/Kconfig 8 additions, 0 deletionssound/Kconfig
- sound/core/Kconfig 0 additions, 6 deletionssound/core/Kconfig
- sound/core/Makefile 1 addition, 2 deletionssound/core/Makefile
- sound/core/control.c 9 additions, 9 deletionssound/core/control.c
- sound/core/hwdep.c 3 additions, 7 deletionssound/core/hwdep.c
- sound/core/info.c 0 additions, 2 deletionssound/core/info.c
- sound/core/init.c 4 additions, 3 deletionssound/core/init.c
- sound/core/memory.c 2 additions, 214 deletionssound/core/memory.c
- sound/core/misc.c 6 additions, 8 deletionssound/core/misc.c
Loading
Please register or sign in to comment