Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (308 commits)
  ALSA: sound/pci/asihpi: check adapter index in hpi_ioctl
  ALSA: aloop - Fix possible IRQ lock inversion
  ALSA: sound/core: merge list_del()/list_add_tail() to list_move_tail()
  ALSA: ctxfi - use list_move() instead of list_del()/list_add() combination
  ALSA: firewire - msleep needs delay.h
  ALSA: firewire-lib, firewire-speakers: handle packet queueing errors
  ALSA: firewire-lib: allocate DMA buffer separately
  ALSA: firewire-lib: use no-info SYT for packets without SYT sample
  ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver
  ALSA: hda - Remove an unused variable in patch_realtek.c
  ALSA: hda - pin-adc-mux-dmic auto-configuration of 92HD8X codecs
  ALSA: hda - fix digital mic selection in mixer on 92HD8X codecs
  ALSA: hda - Move default input-src selection to init part
  ALSA: hda - Initialize special cases for input src in init phase
  ALSA: ctxfi - Clear input settings before initialization
  ALSA: ctxfi - Fix SPDIF status retrieval
  ALSA: ctxfi - Fix incorrect SPDIF status bit mask
  ALSA: ctxfi - Fix microphone boost codes/comments
  ALSA: atiixp - Fix wrong time-out checks during ac-link reset
  ALSA: intel8x0m: append 'm' to "r_intel8x0"
  ...

...

This commit is contained in:

Linus Torvalds 2011-03-18 10:46:37 -07:00

parent f2e1fbb5f2 d351cf4603

commit d3e458d781

254 changed files with 27080 additions and 9623 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

sound/Kconfig

View file

2

sound/Makefile

View file

68

sound/core/control.c

View file

7

sound/core/device.c

View file

3

sound/core/memalloc.c

View file

7

sound/core/oss/linear.c

View file

10

sound/core/oss/mixer_oss.c

View file

2

sound/core/oss/mulaw.c

View file

51

sound/core/oss/pcm_oss.c

View file

40

sound/core/oss/pcm_plugin.c

View file

11

sound/core/oss/pcm_plugin.h

View file

6

sound/core/oss/route.c

View file

10

sound/core/pcm.c

View file

35

sound/core/pcm_misc.c

View file

2

sound/core/pcm_native.c

View file

7

sound/core/seq/seq_clientmgr.c

View file

6

sound/core/seq/seq_memory.c

View file

4

sound/core/seq/seq_memory.h

View file

2

sound/core/seq/seq_ports.c

View file

8

sound/core/timer.c

View file

2

sound/core/vmaster.c

View file

19

sound/drivers/aloop.c

View file

25

sound/firewire/Kconfig

View file

6

sound/firewire/Makefile

View file

562

sound/firewire/amdtp.c

View file

169

sound/firewire/amdtp.h

View file

308

sound/firewire/cmp.c

View file

41

sound/firewire/cmp.h

View file

224

sound/firewire/fcp.c

View file

12

sound/firewire/fcp.h

View file

232

sound/firewire/iso-resources.c

View file

39

sound/firewire/iso-resources.h

View file

85

sound/firewire/lib.c

View file

19

sound/firewire/lib.h

View file

74

sound/firewire/packets-buffer.c

View file

26

sound/firewire/packets-buffer.h

View file

858

sound/firewire/speakers.c

View file

56

sound/oss/soundcard.c

View file

12

sound/pci/Kconfig

View file

90

sound/pci/ac97/ac97_codec.c

View file

52

sound/pci/ac97/ac97_patch.c

View file

774

sound/pci/asihpi/asihpi.c

View file

1220

sound/pci/asihpi/hpi.h

View file

297

sound/pci/asihpi/hpi6000.c

View file

611

sound/pci/asihpi/hpi6205.c

View file

7

sound/pci/asihpi/hpi6205.h

View file

1100

sound/pci/asihpi/hpi_internal.h

View file

474

sound/pci/asihpi/hpicmn.c

View file

24

sound/pci/asihpi/hpicmn.h

View file

155

sound/pci/asihpi/hpidebug.c

View file

323

sound/pci/asihpi/hpidebug.h

View file

37

sound/pci/asihpi/hpidspcd.c

View file

2

sound/pci/asihpi/hpidspcd.h

View file

2498

sound/pci/asihpi/hpifunc.c

View file

File diff suppressed because it is too large Load diff

18

sound/pci/asihpi/hpimsginit.c

View file

12

sound/pci/asihpi/hpimsginit.h

View file

201

sound/pci/asihpi/hpimsgx.c

View file

90

sound/pci/asihpi/hpioctl.c

View file

10

sound/pci/asihpi/hpios.h

View file

2

sound/pci/atiixp.c

View file

2

sound/pci/atiixp_modem.c

View file

3

sound/pci/au88x0/au88x0_eq.c

View file

450

sound/pci/azt3328.c

View file

2

sound/pci/ctxfi/ctatc.c

View file

2

sound/pci/ctxfi/ctdaio.c

View file

28

sound/pci/ctxfi/cthw20k2.c

View file

19

sound/pci/ctxfi/ctmixer.c

View file

3

sound/pci/ctxfi/ctvmem.c

View file

2

sound/pci/emu10k1/emu10k1_main.c

View file

105

sound/pci/hda/hda_codec.c

View file

5

sound/pci/hda/hda_codec.h

View file

7

sound/pci/hda/hda_intel.c

View file

24

sound/pci/hda/hda_local.h

View file

117

sound/pci/hda/patch_analog.c

View file

124

sound/pci/hda/patch_conexant.c

View file

22

sound/pci/hda/patch_hdmi.c

View file

206

sound/pci/hda/patch_realtek.c

View file

318

sound/pci/hda/patch_sigmatel.c

View file

107

sound/pci/intel8x0m.c

View file

4472

sound/pci/rme9652/hdspm.c

View file

File diff suppressed because it is too large Load diff

6

sound/ppc/pmac.c

View file

2

sound/soc/Kconfig

View file

2

sound/soc/Makefile

View file

34

sound/soc/codecs/Kconfig

View file

18

sound/soc/codecs/Makefile

View file

1

sound/soc/codecs/ak4104.c

View file

24

sound/soc/codecs/ak4642.c

View file

8

sound/soc/codecs/cs4270.c

View file

667

sound/soc/codecs/cs4271.c

View file

72

sound/soc/codecs/dfbmcs320.c

View file

276

sound/soc/codecs/lm4857.c

View file

2

sound/soc/codecs/max98088.c

View file

389

sound/soc/codecs/max9850.c

View file

38

sound/soc/codecs/max9850.h

View file

1513

sound/soc/codecs/sgtl5000.c

View file

400

sound/soc/codecs/sgtl5000.h

View file

949

sound/soc/codecs/sn95031.c

View file

132

sound/soc/codecs/sn95031.h

View file

794

sound/soc/codecs/tlv320aic32x4.c

View file

143

sound/soc/codecs/tlv320aic32x4.h

View file

Some files were not shown because too many files have changed in this diff Show more