Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform ... * multiplatform/platform-data: ARM: spear: move platform_data definitions ARM: samsung: move platform_data definitions ARM: orion: move platform_data definitions ARM: nomadik: move platform_data definitions ARM: w90x900: move platform_data definitions ARM: vt8500: move platform_data definitions ARM: tegra: move sdhci platform_data definition ARM: sa1100: move platform_data definitions ARM: pxa: move platform_data definitions ARM: netx: move platform_data definitions ARM: msm: move platform_data definitions ARM: imx: move platform_data definitions ARM: ep93xx: move platform_data definitions ARM: davinci: move platform_data definitions ARM: at91: move platform_data definitions Conflicts due to removed files: arch/arm/mach-tegra/board-harmony.c arch/arm/mach-tegra/board-trimslice.c Conflicts due to code removal: arch/arm/mach-tegra/board-paz00.c Context conflicts in: drivers/mmc/host/sdhci-tegra.c drivers/net/irda/pxaficp_ir.c Signed-off-by: Olof Johansson <olof@lixom.net>		2012-09-22 01:07:21 -07:00
..
aoa	sound/aoa: Adapt to new i2c probing scheme	2012-07-11 18:22:48 +10:00
arm	ALSA: platform: Check CONFIG_PM_SLEEP instead of CONFIG_PM	2012-08-09 15:47:15 +02:00
atmel	ALSA: sound/atmel/ac97c.c: fix error return code	2012-08-20 10:56:01 +02:00
core	ALSA: compress_core: fix open flags test in snd_compr_open()	2012-09-11 14:27:40 +02:00
drivers	ALSA: platform: Check CONFIG_PM_SLEEP instead of CONFIG_PM	2012-08-09 15:47:15 +02:00
firewire	IEEE 1394 (FireWire) subsystem updates post v3.4:	2012-05-24 12:57:47 -07:00
i2c	[media] snd_tea575x: Add a cannot_mute flag	2012-07-30 17:57:01 -03:00
isa	ALSA: snd-als100: fix suspend/resume	2012-08-21 07:29:40 +02:00
mips	ALSA: Convert mips directory to module_platform_driver	2011-11-24 13:03:02 +01:00
oss	ASoC: Additional updates for 3.6	2012-08-20 21:26:04 +02:00
parisc
pci	ALSA: hda - Yet another position_fix quirk for ASUS machines	2012-09-13 16:56:13 +02:00
pcmcia	ALSA: pdaudiocf: Remove superfluous pm_message_t argument from suspend	2012-07-03 08:23:08 +02:00
ppc	ALSA: sound/ppc/snd_ps3.c: fix error return code	2012-08-20 11:01:14 +02:00
sh	ALSA: Add missing .owner=THIS_MODULE to platform_driver definitions	2012-07-02 17:50:05 +02:00
soc	Merge branch 'multiplatform/platform-data' into next/multiplatform	2012-09-22 01:07:21 -07:00
sparc	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
spi	ALSA: Convert at73c213 to module_spi_driver	2012-01-27 15:18:36 +01:00
synth	sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed	2011-10-31 19:31:22 -04:00
usb	ALSA: usb-audio: Fix bogus error messages for delay accounting	2012-09-06 15:00:15 +02:00
ac97_bus.c
Kconfig	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
last.c	ALSA: workaround: change the timing of alsa_sound_last_init()	2012-04-19 13:51:54 +02:00
Makefile
sound_core.c	sound: allow the unit search until 256 in sound_core.c	2012-05-08 17:27:03 +02:00
sound_firmware.c	sound_firmware: don't pass crap to filp_close()	2012-07-29 21:24:22 +04:00