Mark Brown 53a61d967a Merge branch 'for-2.6.34' into for-2.6.35 ...

Conflicts due to context changes next to the backported DMA data change:
	include/sound/soc.h

2010-04-05 19:19:32 +01:00

..

aoa

of: unify phandle name in struct device_node

2010-01-28 14:06:53 -07:00

arm

Merge commit 'v2.6.34-rc2' into for-2.6.34

2010-03-22 11:17:26 +00:00

atmel

ALSA: snd-atmel-abdac: increase periods_min to 6 instead of 4

2009-04-06 03:56:28 +02:00

core

ALSA: Add support for key reporting via the jack interface

2010-03-17 18:10:46 +00:00

drivers

Merge remote branch 'alsa/devel' into topic/misc

2010-02-12 10:42:38 +01:00

i2c

Merge branch 'topic/hda' into for-linus

2009-12-04 16:22:45 +01:00

isa

sound: fix opti92x-ad1848 build

2010-03-08 18:36:17 +01:00

mips

ALSA: pcm - Call pgprot_noncached() for vmalloc'ed buffers

2010-01-18 15:00:34 +01:00

oss

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

2010-03-18 16:48:19 -07:00

parisc

ALSA: sound/parisc: Move dereference after NULL test

2009-10-30 12:01:38 +01:00

pci

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

2010-03-18 16:48:19 -07:00

pcmcia

ALSA: pcm - Call pgprot_noncached() for vmalloc'ed buffers

2010-01-18 15:00:34 +01:00

ppc

of: add 'of_' prefix to machine_is_compatible()

2010-02-09 08:33:00 -07:00

sh

Merge branch 'topic/beep-rename' into topic/core-change

2009-12-01 15:58:10 +01:00

soc

Merge branch 'for-2.6.34' into for-2.6.35

2010-04-05 19:19:32 +01:00

sparc

ALSA: Add missing SNDRV_PCM_INFO_BATCH flag to some drivers

2009-04-28 15:06:44 +02:00

spi

ALSA: Convert to snd_card_create() in other sound/*

2009-01-12 15:21:19 +01:00

synth

tree-wide: fix typos "couter" -> "counter"

2009-12-04 15:39:51 +01:00

usb

ALSA: usbaudio - remove debug "SAMPLE BYTES" printk line

2010-03-03 22:40:04 +01:00

ac97_bus.c

ALSA: ac97 - Include ac97_codec.h for ac97_bus_type declaration

2008-12-02 16:25:37 +01:00

Kconfig

tree-wide: fix assorted typos all over the place

2009-12-04 15:39:55 +01:00

last.c

[ALSA] Remove sound/driver.h

2008-01-31 17:29:48 +01:00

Makefile

ALSA: Add Atmel ALSA drivers directory

2009-02-05 15:08:53 +01:00

sound_core.c

ALSA: use subsys_initcall for sound core instead of module_init

2010-01-14 21:21:47 +01:00

sound_firmware.c

…