Russell King 53ffe3b440 [ARM] Merge most of the PXA work for initial merge ... This includes PXA work up to the SPI changes for the initial merge, since e172274ccc depends on the SPI tree being merged. Conflicts: arch/arm/configs/em_x270_defconfig arch/arm/configs/xm_x270_defconfig		2008-07-14 23:34:46 +01:00
..
aoa	[ALSA] Remove sound/driver.h	2008-01-31 17:29:48 +01:00
arm	[ALSA] pxa2xx-ac97: Support PXA3xx AC97	2008-04-24 12:00:41 +02:00
core	SOUND: fix race in device_create	2008-05-20 13:31:55 -07:00
drivers	[ALSA] snd-pcsp - fix pcsp_treble_info() to honour an item number	2008-05-25 18:21:10 +02:00
i2c	[ALSA] some fixes and cleanup for ICE1724 cards	2008-04-24 12:00:25 +02:00
isa	ALSA: sb - Fix wrong assertions	2008-06-23 12:06:23 +02:00
mips	[ALSA] Remove sound/driver.h	2008-01-31 17:29:48 +01:00
oss	msnd_* is ISA-only	2008-05-21 16:55:59 -07:00
parisc	[ALSA] Remove sound/driver.h	2008-01-31 17:29:48 +01:00
pci	ALSA: aw2 - Fix Oops at initialization	2008-06-23 12:06:23 +02:00
pcmcia	[ALSA] Remove sound/driver.h	2008-01-31 17:29:48 +01:00
ppc	[ALSA] snd-powermac: style burgundy.c	2008-04-24 12:00:38 +02:00
sh	Remove duplicated unlikely() in IS_ERR()	2008-04-29 08:06:25 -07:00
soc	[ARM] Merge most of the PXA work for initial merge	2008-07-14 23:34:46 +01:00
sparc	[ALSA] Remove sound/driver.h	2008-01-31 17:29:48 +01:00
spi	[ALSA] at73c213: Add constraints for periods value	2008-04-24 12:00:26 +02:00
synth	[ALSA] emux midi synthesizer doesn't honor SOFT_PEDAL-release event	2008-05-13 14:47:43 +02:00
usb	caiaq endianness fix	2008-05-21 16:56:00 -07:00
ac97_bus.c	[ALSA] ac97_bus power management	2007-02-09 09:03:54 +01:00
Kconfig	snd-pcsp: adjust help texts to frighten users	2008-05-19 12:04:35 +02:00
last.c	[ALSA] Remove sound/driver.h	2008-01-31 17:29:48 +01:00
Makefile	[ALSA] Add SPI devices to ALSA Kconfig and Makefile	2007-10-16 15:57:47 +02:00
sound_core.c	[PATCH] mark struct file_operations const 9	2007-02-12 09:48:46 -08:00
sound_firmware.c	Detach sched.h from mm.h	2007-05-21 09:18:19 -07:00