History log of /linux/sound/pci/emu10k1/emu10k1_main.c (Results 776 – 800 of 963)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 513b046c 21-Oct-2006 David Woodhouse <dwmw2@infradead.org>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


# 701328a7 11-Oct-2006 Jeff Garzik <jeff@garzik.org>

Merge branch 'master' into upstream-fixes


# 24fcbace 11-Oct-2006 Jeff Garzik <jeff@garzik.org>

Merge branch 'master' into upstream-fixes


# 20ebba65 06-Oct-2006 Linus Torvalds <torvalds@g5.osdl.org>

Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] version 1.0.13
[ALSA] sound/pci/au88x0/

Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] version 1.0.13
[ALSA] sound/pci/au88x0/au88x0.c: ioremap balanced with iounmap
[ALSA] Handle file operations during snd_card disconnects using static file->f_op
[ALSA] emu10k1: Fix outl() in snd_emu10k1_resume_regs()
[ALSA] Repair snd-usb-usx2y for usb 2.6.18
[ALSA] Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check()
[ALSA] Dereference after free in snd_hwdep_release()
[ALSA] Fix memory leak in sound/isa/es18xx.c
[ALSA] hda-intel - New pci id for Nvidia MCP61
[ALSA] Add new subdevice ids for hda-intel
[ALSA] WM9712 fixes for ac97_patch.c
[ALSA] hda/patch_si3054: new codec vendor IDs

show more ...


# 4130d59b 04-Oct-2006 Arnaud Patard <arnaud.patard@rtp-net.org>

[ALSA] emu10k1: Fix outl() in snd_emu10k1_resume_regs()

The emu10k1 driver saves the A_IOCFG and HCFG register on suspend and restores
it on resumes. Unfortunately, this doesn't work as the argument

[ALSA] emu10k1: Fix outl() in snd_emu10k1_resume_regs()

The emu10k1 driver saves the A_IOCFG and HCFG register on suspend and restores
it on resumes. Unfortunately, this doesn't work as the arguments to outl() are
reversed.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

show more ...


# 8a84fc15 01-Oct-2006 David Woodhouse <dwmw2@infradead.org>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Manually resolve conflict in include/mtd/Kbuild

Signed-off-by: David Woodhouse <dwmw2@infradead.org>


# 2dc94310 27-Sep-2006 Russell King <rmk@dyn-67.arm.linux.org.uk>

Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel


# 363e065c 25-Sep-2006 Steven Whitehouse <swhiteho@redhat.com>

[GFS2] Fix up merge of Linus' kernel into GFS2

This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming

[GFS2] Fix up merge of Linus' kernel into GFS2

This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming -mm and FC kernels
due to the "one line per header" format now used for the
kernel headers.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

Conflicts:

include/linux/Kbuild
include/linux/kernel.h

show more ...


# 02b25fcf 24-Sep-2006 David Woodhouse <dwmw2@infradead.org>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


# 23930fa1 24-Sep-2006 Jeff Garzik <jeff@garzik.org>

Merge branch 'master' into upstream


# 1aedf2cc 24-Sep-2006 James Bottomley <jejb@sparkweed.localdomain>

Merge mulgrave-w:git/linux-2.6

Conflicts:

include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.


# f7425b16 24-Sep-2006 Linus Torvalds <torvalds@g5.osdl.org>

Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (148 commits)
[ALSA] intel8x0m - Free irq in sus

Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (148 commits)
[ALSA] intel8x0m - Free irq in suspend
[ALSA] Move CONFIG_SND_AC97_POWER_SAVE to pci/Kconfig
[ALSA] usb-audio: add mixer control names for the Aureon 5.1 MkII
[ALSA] ES1938: remove duplicate field initialization
[ALSA] usb-audio: increase number of packets per URB
[ALSA] hda-codec - Fix headphone auto-toggle on sigmatel codec
[ALSA] hda-intel - A slight cleanup of timeout check in azx_get_response()
[ALSA] hda-codec - Fix mic input with STAC92xx codecs
[ALSA] mixart: Use SEEK_{SET,CUR,END} instead of hardcoded values
[ALSA] gus: Use SEEK_{SET,CUR,END} instead of hardcoded values
[ALSA] opl4: Use SEEK_{SET,CUR,END} instead of hardcoded values
[ALSA] sound core: Use SEEK_{SET,CUR,END} instead of hardcoded values
[ALSA] hda-codec - Support multiple headphone pins
[ALSA] hda_intel prefer 24bit instead of 20bit
[ALSA] hda-codec - Add vendor ids for Motorola and Conexant
[ALSA] hda-codec - Add device id for Motorola si3054-compatible codec
[ALSA] Add missing compat ioctls for ALSA control API
[ALSA] powermac - Fix Oops when conflicting with aoa driver
[ALSA] aoa: add locking to tas codec
[ALSA] hda-intel - Fix suspend/resume with MSI
...

show more ...


Revision tags: v2.6.18, v2.6.18-rc7, v2.6.18-rc6, v2.6.18-rc5, v2.6.18-rc4, v2.6.18-rc3, v2.6.18-rc2
# 11b3a755 08-Jul-2006 James Courtier-Dutton <James@superbug.co.uk>

[ALSA] snd-emu10k1: Implement 24bit capture via Philips 1361T ADC for SB0240 card.


Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>


# 0612ec48 19-Sep-2006 Dmitry Torokhov <dtor@insightbb.com>

Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


# 9b4f2e95 17-Sep-2006 Stefan Richter <stefanr@s5r6.in-berlin.de>

ieee1394: merge from Linus

Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".

Signed

ieee1394: merge from Linus

Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

show more ...


# 115b384c 05-Sep-2006 Dave Jones <davej@redhat.com>

Merge ../linus


# 0a7d5f8c 31-Aug-2006 David Woodhouse <dwmw2@infradead.org>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


# 8ce7a9c1 28-Aug-2006 James Bottomley <jejb@mulgrave.il.steeleye.com>

Merge ../linux-2.6


# e9ffb3d7 14-Aug-2006 John W. Linville <linville@tuxdriver.com>

Merge branch 'from-linus' into upstream


# 32bc6e09 08-Aug-2006 Paul Mackerras <paulus@samba.org>

Merge branch 'merge'


# ad73c67e 07-Aug-2006 Steven Whitehouse <swhiteho@redhat.com>

Merge branch 'master'


# 38ebb1e0 07-Aug-2006 Jeff Garzik <jeff@garzik.org>

Merge branch 'master' into upstream


# 242898be 07-Aug-2006 Jeff Garzik <jeff@garzik.org>

Merge branch 'master' into upstream


# 00dd7b7d 06-Aug-2006 James Bottomley <jejb@mulgrave.il.steeleye.com>

Merge ../linux-2.6

Conflicts:

arch/ia64/hp/sim/simscsi.c

Stylistic differences in two separate fixes for buffer->request_buffer
problem.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.

Merge ../linux-2.6

Conflicts:

arch/ia64/hp/sim/simscsi.c

Stylistic differences in two separate fixes for buffer->request_buffer
problem.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

show more ...


# a05ef8bf 06-Aug-2006 Linus Torvalds <torvalds@g5.osdl.org>

Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

* master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] Don't reject O_RDWR at opening PCM OSS with read/write-only device
[

Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

* master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] Don't reject O_RDWR at opening PCM OSS with read/write-only device
[ALSA] snd-emu10k1: Implement support for Audigy 2 ZS [SB0353]
[ALSA] add MAINTAINERS entry for snd-aoa
[ALSA] aoa: platform function gpio: ignore errors from functions that don't exist
[ALSA] make snd-powermac load even when it can't bind the device
[ALSA] aoa: fix toonie codec
[ALSA] aoa: feature gpio layer: fix IRQ access
[ALSA] Conversions from kmalloc+memset to k(z|c)alloc
[ALSA] snd-emu10k1: Fixes ALSA bug#2190

show more ...


1...<<313233343536373839