1
linux/sound/soc/sh
Linus Torvalds 1dfd166e93 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (110 commits)
  sh: i2c-sh7760: Replase from ctrl_* to __raw_*
  sh: clkfwk: Shuffle around to match the intc split up.
  sh: clkfwk: modify for_each_frequency end condition
  sh: fix clk_get() error handling
  sh: clkfwk: Fix fault in frequency iterator.
  sh: clkfwk: Add a helper for rate rounding by divisor ranges.
  sh: clkfwk: Abstract rate rounding helper.
  sh: clkfwk: support clock remapping.
  sh: pci: Convert to upper/lower_32_bits() helpers.
  sh: mach-sdk7786: Add support for the FPGA SRAM.
  sh: Provide a generic SRAM pool for tiny memories.
  sh: pci: Support secondary FPGA-driven PCIe clocks on SDK7786.
  sh: pci: Support slot 4 routing on SDK7786.
  sh: Fix up PMB locking.
  sh: mach-sdk7786: Add support for fpga gpios.
  sh: use pr_fmt for clock framework, too.
  sh: remove name and id from struct clk
  sh: free-without-alloc fix for sh_mobile_lcdcfb
  sh: perf: Set up perf_max_events.
  sh: perf: Support SH-X3 hardware counters.
  ...

Fix up trivial conflicts (perf_max_events got removed) in arch/sh/kernel/perf_event.c
2010-10-25 07:51:49 -07:00
..
dma-sh7760.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
fsi-ak4642.c ASoC: fsi: Add specified ID for soc-audio 2010-07-17 19:45:56 +01:00
fsi-da7210.c ASoC: fsi: Add specified ID for soc-audio 2010-07-17 19:45:56 +01:00
fsi.c ASoC: fsi: Add new funtion for SPDIF 2010-07-29 10:28:49 -07:00
hac.c ASoC: Fix some missing dai_ops conversions 2009-03-16 14:13:57 +00:00
Kconfig ASoC: Fix I2C dependency for SND_FSI_AK4642 and SND_FSI_DA7210 2010-06-16 16:34:17 +01:00
Makefile ASoC: add support for the sh7722 Migo-R board 2010-01-29 14:31:02 +00:00
migor.c ASoC: fix clkdev API usage in sh/migor.c 2010-09-19 16:02:47 +01:00
sh7760-ac97.c ASoC: Push platform registration down into the card 2008-12-02 16:03:40 +00:00
siu_dai.c Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc 2010-05-27 09:46:10 +02:00
siu_pcm.c sound/soc/sh/siu: Fixed undefined dma_length of scatter gather list 2010-08-04 15:59:50 +09:00
siu.h sh: define DMA slaves per CPU type, remove now redundant header 2010-05-22 16:51:17 +09:00
ssi.c ASoC: correct print specifiers for unsigneds 2009-05-28 10:20:26 +01:00