linux/sound/soc
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
..
atmel ASoC: atmel: trivial code cleanup 2010-06-07 14:25:45 +01:00
au1x SOUND: Au1000: Fix section mismatch 2010-07-26 19:08:15 +01:00
blackfin ASoC: add AD1980 obsolete information 2010-08-10 15:43:45 +01:00
codecs ASoC: Remove DSP mode support for WM8776 2010-08-16 11:46:57 +01:00
davinci ASoC: davinci: let platform data define edma queue numbers 2010-07-20 09:57:20 +01:00
ep93xx ASoC: EP93xx: Add Snapper CL15 i2s audio support 2010-06-09 11:16:18 +01:00
fsl Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-12 09:11:31 -07:00
imx ASoC: i.MX ssi: use SSI_STCCR in synchronous mode 2010-08-23 13:33:05 +01:00
jz4740 ASoC: JZ4740: Add qi_lb60 board driver 2010-06-23 00:10:57 +01:00
kirkwood ASoC: kirkwood-i2s: Handle mute/unmute playback/record 2010-07-13 12:37:09 +01:00
nuc900 ASoC: NUC900: patch for fix build error 2010-06-10 14:40:35 +01:00
omap ASoC: omap-mcbsp: Remove period size constraint in THRESHOLD mode 2010-08-02 10:38:16 +01:00
pxa [ARM] pxa/spitz: Correctly register WM8750 2010-05-31 12:03:45 +08:00
s3c24xx Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
s6000 ASoC: s6000: use resource_size for {request/release}_mem_region and ioremap 2010-06-02 14:02:39 +01:00
sh Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 2010-10-25 07:51:49 -07:00
txx9 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 2010-05-21 17:05:46 -07:00
Kconfig ASoC: Fix sorting of Makefile and Kconfig 2010-07-05 23:35:29 +09:00
Makefile ASoC: Fix sorting of Makefile and Kconfig 2010-07-05 23:35:29 +09:00
soc-cache.c ASoC: Fix multi-componentism 2010-09-22 18:47:40 +01:00
soc-core.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
soc-dapm.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
soc-jack.c ASoC: Allow reporting of NULL jacks 2010-04-23 17:07:10 +01:00
soc-utils.c ASoC: Add BCLK calculation utility for TDM mode too 2009-11-25 19:55:46 +00:00