Linus Torvalds 6f128fa344 Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci ... * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (62 commits) DaVinci: DM646x - platform changes for vpif capture and display drivers davinci: DM355 - platform changes for vpfe capture davinci: DM644x platform changes for vpfe capture davinci: audio: move tlv320aic33 i2c setup into board files DaVinci: EDMA: Adding 2 new APIs for allocating/freeing PARAMs DaVinci: DM365: Adding entries for DM365 IRQ's DaVinci: DM355: Adding PINMUX entries for DM355 Display davinci: Handle pinmux conflict between mmc/sd and nor flash davinci: Add NOR flash support for da850/omap-l138 davinci: Add NAND flash support for DA850/OMAP-L138 davinci: Add MMC/SD support for da850/omap-l138 davinci: Add platform support for da850/omap-l138 GLCD davinci: Macro to convert GPIO signal to GPIO pin number davinci: Audio support for DA850/OMAP-L138 EVM davinci: Audio support for DA830 EVM davinci: Correct the number of GPIO pins for da850/omap-l138 davinci: Configure MDIO pins for EMAC DaVinci: DM365: Add Support for new Revision of silicon DaVinci: DM365: Fix Compilation issue due to PINMUX entry DaVinci: EDMA: Updating default queue handling ...		2009-09-18 09:20:37 -07:00
..
aoa	ALSA: sound/aoa: Add kmalloc NULL tests	2009-07-31 10:14:58 +02:00
arm	ASoC: fix pxa2xx-ac97.c breakage	2009-09-04 20:19:56 +01:00
atmel	ALSA: snd-atmel-abdac: increase periods_min to 6 instead of 4	2009-04-06 03:56:28 +02:00
core	Merge branch 'topic/tlv-minmax' into for-linus	2009-09-10 15:33:06 +02:00
drivers	ALSA: dummy - Increase MAX_PCM_SUBSTREAMS to 128	2009-09-08 18:15:17 +02:00
i2c	V4L/DVB (10771): tea575x-tuner: convert it to V4L2 API	2009-03-30 12:43:02 -03:00
isa	Merge branch 'topic/cmi8330' into for-linus	2009-09-10 15:32:45 +02:00
mips	ALSA: sgio2audio.c: clean up checking	2009-06-07 09:08:43 +02:00
oss	sound: vwsnd: Fix setting of cfgval and ctlval in li_setup_dma()	2009-08-26 12:42:43 +02:00
parisc	Merge branch 'topic/section-fix' into for-linus	2009-06-10 07:26:46 +02:00
pci	Merge branch 'fix/hda' into for-linus	2009-09-17 21:08:56 +02:00
pcmcia	ALSA: Add missing SNDRV_PCM_INFO_BATCH flag to some drivers	2009-04-28 15:06:44 +02:00
ppc	Merge branch 'topic/ps3' into for-linus	2009-06-12 20:03:16 +02:00
sh	trivial: Fix misspelling of firmware	2009-03-30 15:21:59 +02:00
soc	Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci	2009-09-18 09:20:37 -07: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	ALSA: clean up the logic for building sequencer modules	2009-05-29 11:49:42 +02:00
usb	Merge branch 'topic/usb-audio' into for-linus	2009-09-10 15:33:07 +02:00
ac97_bus.c	ALSA: ac97 - Include ac97_codec.h for ac97_bus_type declaration	2008-12-02 16:25:37 +01:00
Kconfig	sound: make OSS device number claiming optional and schedule its removal	2009-08-10 13:59:36 +02: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	sound: make OSS device number claiming optional and schedule its removal	2009-08-10 13:59:36 +02:00
sound_firmware.c	Detach sched.h from mm.h	2007-05-21 09:18:19 -07:00