korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-17 17:24:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
0df0914d41
linux/sound/soc/omap
History
Linus Torvalds 0df0914d41 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: (258 commits)
  omap: zoom: host should not pull up wl1271's irq line
  arm: plat-omap: iommu: fix request_mem_region() error path
  OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430
  omap4: mux: Remove duplicate mux modes
  omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag
  omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set
  omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected
  omap4: board-omap4panda: Initialise the serial pads
  omap3: board-3430sdp: Initialise the serial pads
  omap4: board-4430sdp: Initialise the serial pads
  omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init
  omap2+: mux: Remove the use of IDLE flag
  omap2+: Add separate list for dynamic pads to mux
  perf: add OMAP support for the new power events
  OMAP4: Add IVA OPP enteries.
  OMAP4: Update Voltage Rail Values for MPU, IVA and CORE
  OMAP4: Enable 800 MHz and 1 GHz MPU-OPP
  OMAP3+: OPP: Replace voltage values with Macros
  OMAP3: wdtimer: Fix CORE idle transition
  Watchdog: omap_wdt: add fine grain runtime-pm
  ...

Fix up various conflicts in
 - arch/arm/mach-omap2/board-omap3evm.c
 - arch/arm/mach-omap2/clock3xxx_data.c
 - arch/arm/mach-omap2/usb-musb.c
 - arch/arm/plat-omap/include/plat/usb.h
 - drivers/usb/musb/musb_core.h
2011-03-17 19:28:15 -07:00
..
am3517evm.c ASoC: AM3517: Update codec name after multi-component update 2011-03-09 11:48:55 +00:00
ams-delta.c ASoC: Amstrad Delta: fix const related build error 2011-02-01 14:13:47 +00:00
igep0020.c ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00
Kconfig ASoC: omap: N810: Don't select CONFIG_OMAP_MUX but make it as dependency 2010-12-02 11:42:30 +00:00
Makefile ASoC: SDP4430: Add sdp4430 machine driver 2010-05-19 14:04:40 +01:00
mcpdm.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
mcpdm.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
n810.c ASoC: Remove needless inclusion of tlv320aic3x.h from machine drivers 2011-01-05 11:28:50 +00:00
omap2evm.c ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00
omap3beagle.c ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00
omap3evm.c ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00
omap3pandora.c Merge branch 'for-2.6.37' into for-2.6.38 2010-11-24 11:57:43 +00:00
omap-mcbsp.c ASoC: McBSP: get hw params from McBSP driver 2011-02-24 13:04:13 -08:00
omap-mcbsp.h omap: Start using CONFIG_SOC_OMAP 2011-01-27 16:39:40 -08:00
omap-mcpdm.c Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2010-10-25 13:46:56 -07:00
omap-pcm.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
omap-pcm.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
osk5912.c Merge branch 'for-2.6.37' into for-2.6.38 2010-11-25 21:16:52 +00:00
overo.c ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00
rx51.c ASoC: Remove needless inclusion of tlv320aic3x.h from machine drivers 2011-01-05 11:28:50 +00:00
sdp3430.c ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00
sdp4430.c ASoC: sdp4430: Add Jack support 2010-12-14 20:31:55 +00:00
zoom2.c ASoC: Do not include soc-dapm.h 2010-11-22 14:04:41 +00:00