leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d6748066ad
linux/sound/soc
History
Linus Torvalds d6748066ad Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (37 commits)
  MIPS: O32: Provide definition of registers ta0 .. ta3.
  MIPS: perf: Add Octeon support for hardware perf.
  MIPS: perf: Add support for 64-bit perf counters.
  MIPS: perf: Reorganize contents of perf support files.
  MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.c
  MIPS: Add accessor macros for 64-bit performance counter registers.
  MIPS: Add probes for more Octeon II CPUs.
  MIPS: Add more CPU identifiers for Octeon II CPUs.
  MIPS: XLR, XLS: Add comment for smp setup
  MIPS: JZ4740: GPIO: Check correct IRQ in demux handler
  MIPS: JZ4740: GPIO: Simplify IRQ demuxer
  MIPS: JZ4740: Use generic irq chip
  MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines
  MIPS: Alchemy: kill au1xxx.h header
  MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines
  MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep
  MIPS: Alchemy: Redo PCI as platform driver
  MIPS: Alchemy: more base address cleanup
  MIPS: Alchemy: rewrite USB platform setup.
  MIPS: Alchemy: abstract USB block control register access
  ...

Fix up trivial conflicts in:
	arch/mips/alchemy/devboards/db1x00/platform.c
	drivers/ide/Kconfig
	drivers/mmc/host/au1xmmc.c
	drivers/video/Kconfig
	sound/mips/Kconfig
2011-11-03 13:28:14 -07:00
..
atmel ASoC: Remove redundant snd_soc_dapm_sync() calls from machine drivers 2011-10-08 14:10:54 +01:00
au1x Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
blackfin ASoC: Staticise bf5xx_pcm_i2s_new() 2011-09-21 14:55:50 +01:00
codecs Merge branch 'topic/asoc' into for-linus 2011-10-27 10:43:40 +02:00
davinci Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 2011-10-28 14:25:01 -07:00
ep93xx ASoC: Staticise ep93xx_ac97_dai 2011-10-03 14:15:32 +01:00
fsl ASoC: fsl: Fix error handling if platform_device_add fails 2011-09-20 12:58:59 +01:00
imx ASoC: Fix typo in Kconfig symbol for tlv320aic32x4 2011-10-11 14:32:22 +01:00
jz4740 ASoC: Staticise jz4740_pcm_new() 2011-09-21 14:55:50 +01:00
kirkwood ASoC: Remove redundant snd_soc_dapm_sync() calls from machine drivers 2011-10-08 14:10:54 +01:00
mid-x86 ASoC: Remove redundant snd_soc_dapm_sync() calls from machine drivers 2011-10-08 14:10:54 +01:00
mxs ASoC: keep pointer to resource so it can be freed 2011-10-22 10:46:35 +01:00
nuc900 Merge branch 'topic/asoc' into for-linus 2011-10-27 10:43:40 +02:00
omap ASoC: sdp3430: Let core to deal with the DAPM widgets 2011-10-10 16:18:12 +01:00
pxa ASoC: pxa: Remove redundant snd_soc_dapm_sync() calls from machine drivers 2011-10-13 11:50:04 +01:00
s6000 ASoC: s6000-pcm: remove unused variable 'dai' 2011-08-15 22:51:48 +09:00
samsung Merge branch 'topic/asoc' into for-linus 2011-10-27 10:43:40 +02:00
sh Merge branch 'topic/asoc' into for-linus 2011-10-27 10:43:40 +02:00
tegra ASoC: Tegra: sparse cleanup 2011-10-17 22:43:16 +01:00
txx9 Merge branch 'topic/asoc' into for-linus 2011-10-27 10:43:40 +02:00
Kconfig Merge branch 'regmap-asoc' into for-3.2 2011-08-08 15:00:13 +09:00
Makefile ASoC: mxs: add asoc configuration files 2011-07-28 11:47:41 +01:00
soc-cache.c Merge branch 'for-3.1' into for-3.2 2011-08-31 09:46:42 +01:00
soc-core.c Merge branch 'topic/remove-irqf_disable' into for-linus 2011-10-26 23:51:48 +02:00
soc-dapm.c ASoC: Fix DAPM sync for TLV320AIC3x custom DAPM widget 2011-10-10 10:28:26 +01:00
soc-io.c ASoC: Squash error codes from regmap down to -1 on read 2011-10-09 14:35:59 +01:00
soc-jack.c ASoC: Ensure DAPM widgets are set up before we sync jacks 2011-10-06 16:18:39 +01:00
soc-pcm.c ASoC: core: Add flag to ignore pmdown_time at pcm_close 2011-10-14 20:42:21 +01:00
soc-utils.c ASoC: Work around allmodconfig failure 2011-04-28 12:09:06 +01:00