linux-sg2042/sound/soc/omap
Linus Torvalds 7b6181e068 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: (163 commits)
  omap: complete removal of machine_desc.io_pg_offst and .phys_io
  omap: UART: fix wakeup registers for OMAP24xx UART2
  omap: Fix spotty MMC voltages
  ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h
  serial: omap-serial: fix signess error
  OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish
  omap: dma: Fix buffering disable bit setting for omap24xx
  omap: serial: Fix the boot-up crash/reboot without CONFIG_PM
  OMAP3: PM: fix scratchpad memory accesses for off-mode
  omap4: pandaboard: enable the ehci port on pandaboard
  omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set
  omap4: pandaboard: remove unused hsmmc definition
  OMAP: McBSP: Remove null omap44xx ops comment
  OMAP: McBSP: Swap CLKS source definition
  OMAP: McBSP: Fix CLKR and FSR signal muxing
  OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks
  OMAP: control: move plat-omap/control.h to mach-omap2/control.h
  OMAP: split plat-omap/common.c
  OMAP: McBSP: implement functional clock switching via clock framework
  OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c
  ...

Fixed up trivial conflicts in arch/arm/mach-omap2/
{board-zoom-peripherals.c,devices.c} as per Tony
2010-10-25 13:46:56 -07:00
..
Kconfig ASoC: SDP4430: Add sdp4430 machine driver 2010-05-19 14:04:40 +01:00
Makefile ASoC: SDP4430: Add sdp4430 machine driver 2010-05-19 14:04:40 +01:00
am3517evm.c ASoC: omap: Remove needless prints from machine drivers 2010-10-10 11:37:20 +01:00
ams-delta.c ASoC: Use a more adequate name for the CX20442 codec DAI 2010-08-19 15:30:43 +01:00
igep0020.c ASoC: omap: Remove needless prints from machine drivers 2010-10-10 11:37:20 +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: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
omap-mcbsp.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-mcbsp.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01: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
omap2evm.c ASoC: omap: Remove needless prints from machine drivers 2010-10-10 11:37:20 +01:00
omap3beagle.c ASoC: omap: Remove needless prints from machine drivers 2010-10-10 11:37:20 +01:00
omap3evm.c ASoC: omap: Remove needless prints from machine drivers 2010-10-10 11:37:20 +01:00
omap3pandora.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
osk5912.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
overo.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
rx51.c ASoC: omap: rx51: Use gpio_set_value_cansleep for speaker amp control 2010-08-23 12:03:09 +01:00
sdp3430.c ASoC: omap: Remove needless prints from machine drivers 2010-10-10 11:37:20 +01:00
sdp4430.c ASoC: omap: Remove needless prints from machine drivers 2010-10-10 11:37:20 +01:00
zoom2.c ASoC: omap: Remove needless prints from machine drivers 2010-10-10 11:37:20 +01:00