1
linux/sound/soc/omap
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
..
am3517evm.c ASoC: Adding OMAP3517 / AM3517 EVM support in ASOC 2009-10-29 22:28:18 +00:00
ams-delta.c 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
igep0020.c ASoC: Add support for IGEP v2 2009-11-19 10:48:43 +00:00
Kconfig ASoC: Add support for IGEP v2 2009-11-19 10:48:43 +00:00
Makefile ASoC: Add support for IGEP v2 2009-11-19 10:48:43 +00:00
n810.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
omap2evm.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
omap3beagle.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
omap3evm.c 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
omap3pandora.c Merge branch 'for-2.6.32' into for-2.6.33 2009-11-18 13:54:51 +00:00
omap-mcbsp.c 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
omap-mcbsp.h ASoC: OMAP: Add functionality to set CLKR and FSR sources in McBSP DAI 2009-08-28 18:36:43 +01:00
omap-pcm.c Merge 7xx-iosplit-plat-merge with omap-fixes 2009-11-22 10:08:43 -08:00
omap-pcm.h ASoC: OMAP: Use McBSP threshold to playback and capture 2009-08-20 20:10:29 +01:00
osk5912.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
overo.c 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
sdp3430.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
zoom2.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00