linux-sg2042/sound/soc
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -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 ASoC: fix clkdev API usage in sh/migor.c 2010-09-19 16:02:47 +01: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