linux/sound
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
arm Merge branch 'topic/misc' into for-linus 2009-12-04 16:22:37 +01:00
atmel
core Merge branch 'topic/misc' into for-linus 2009-12-04 16:22:37 +01:00
drivers
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
oss Merge branch 'topic/misc' into for-linus 2009-12-04 16:22:37 +01:00
parisc
pci Merge branch 'topic/hda' into for-linus 2009-12-04 16:22:45 +01:00
pcmcia
ppc
sh
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
spi
synth
usb ALSA: usb - Fix mixer map for Hercules Gamesurround Muse Pocket LT 2009-12-01 16:00:08 +01:00
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c
sound_firmware.c