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
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
isa	Merge branch 'topic/cmi8330' into for-linus	2009-09-10 15:32:45 +02:00
mips
oss	sound: vwsnd: Fix setting of cfgval and ctlval in li_setup_dma()	2009-08-26 12:42:43 +02:00
parisc
pci	Merge branch 'fix/hda' into for-linus	2009-09-17 21:08:56 +02:00
pcmcia
ppc	Merge branch 'topic/ps3' into for-linus	2009-06-12 20:03:16 +02:00
sh
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
spi
synth
usb	Merge branch 'topic/usb-audio' into for-linus	2009-09-10 15:33:07 +02:00
ac97_bus.c
Kconfig	sound: make OSS device number claiming optional and schedule its removal	2009-08-10 13:59:36 +02:00
last.c
Makefile
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