Linus Torvalds 1c496784a0 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 ... * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (149 commits) arm: omap: Add omap3_defconfig AM35xx: Defconfig for AM3517 EVM board AM35xx: Add support for AM3517 EVM board omap: 3630sdp: defconfig creation omap: 3630sdp: introduce 3630 sdp board support omap3: Add defconfig for IGEP v2 board omap3: Add minimal IGEP v2 support omap3: Add CompuLab CM-T35 defconfig omap3: Add CompuLab CM-T35 board support omap3: rx51: Add wl1251 wlan driver support omap3: rx51: Add SDRAM init omap1: Add default kernel configuration for Herald omap1: Add board support and LCD for HTC Herald omap: zoom2: update defconfig for LL_DEBUG_NONE omap: zoom3: defconfig creation omap3: zoom: Introduce zoom3 board support omap3: zoom: Drop i2c-1 speed to 2400 omap3: zoom: rename zoom2 name to generic zoom omap3: zoom: split board file for software reuse omap3evm: MIgrate to smsc911x ethernet driver ... Fix trivial conflict (two unrelated config options added next to each other) in arch/arm/mach-omap2/Makefile		2009-12-08 08:15:29 -08:00
..
aoa	ALSA: Don't assume i2c device probing always succeeds	2009-10-01 07:46:33 +02:00
arm	Merge branch 'topic/misc' into for-linus	2009-12-04 16:22:37 +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/misc' into for-linus	2009-12-04 16:22:37 +01:00
drivers	Merge branch 'topic/beep-rename' into topic/core-change	2009-12-01 15:58:10 +01:00
i2c	Merge branch 'topic/hda' into for-linus	2009-12-04 16:22:45 +01:00
isa	Merge branch 'topic/misc' into for-linus	2009-12-04 16:22:37 +01:00
mips	ALSA: Fix invalid __exit in sound/mips/*.c	2009-10-02 11:06:16 +02:00
oss	Merge branch 'topic/misc' into for-linus	2009-12-04 16:22:37 +01:00
parisc	ALSA: sound/parisc: Move dereference after NULL test	2009-10-30 12:01:38 +01:00
pci	Merge branch 'topic/hda' into for-linus	2009-12-04 16:22:45 +01:00
pcmcia	pcmcia: rework the irq_req_t typedef	2009-11-28 18:03:14 +01:00
ppc	Merge branch 'topic/beep-rename' into topic/core-change	2009-12-01 15:58:10 +01:00
sh	Merge branch 'topic/beep-rename' into topic/core-change	2009-12-01 15:58:10 +01:00
soc	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08: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	ALSA: usb - Fix mixer map for Hercules Gamesurround Muse Pocket LT	2009-12-01 16:00:08 +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	sound: Kconfig typo fix	2009-11-17 08:58:40 +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	Driver-Core: extend devnode callbacks to provide permissions	2009-09-19 12:50:38 -07:00
sound_firmware.c