Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/sound/soc/s3c24xx
History
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
..
jive_wm8750.c ASoC: S3C: I2Sv2: Unify i2s_get_clock callback 2010-05-05 15:13:20 +01:00
Kconfig ASoC: Add SmartQ sound driver 2010-07-04 18:04:12 +09:00
lm4857.h [ALSA] ASoC S3C24xx machine drivers - lm4857-h missing patch 2007-07-20 11:11:29 +02:00
ln2440sbc_alc650.c ASoC: AC97: LN2440SBC: Switch to s3c-ac97.c 2010-01-27 20:50:17 +00:00
Makefile ASoC: Add SmartQ sound driver 2010-07-04 18:04:12 +09:00
neo1973_gta02_wm8753.c Fix typo configue => configure in comments 2010-09-23 11:46:50 +02:00
neo1973_wm8753.c Fix typo configue => configure in comments 2010-09-23 11:46:50 +02:00
regs-i2s-v2.h ASoC: S3C64XX: I2S: Use s3c2412 defines 2010-05-05 15:13:48 +01:00
s3c-ac97.c ASoC: s3c: patch for the unnecessary variable 'state' removal 2010-06-03 19:00:16 +01:00
s3c-ac97.h ASoC: AC97: S3C: Add controller driver 2010-01-27 20:48:58 +00:00
s3c-dma.c sound: Remove pr_<level> uses of KERN_<level> 2010-09-13 23:40:29 +02:00
s3c-dma.h ASoC: Rename 's3c24xx-pcm' driver to 's3c-dma' 2009-11-18 13:35:03 +00:00
s3c-i2s-v2.c ASoC:Support Samsung SoC(S5P) in I2Sv2 2010-07-20 09:53:36 +01:00
s3c-i2s-v2.h ASoC: S3C: I2Sv2: New field for controller feature 2010-05-05 15:14:21 +01:00
s3c-pcm.c ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream 2010-03-19 19:37:29 +00:00
s3c-pcm.h ASoC: Added the CPU driver for PCM controllers 2009-11-18 13:35:05 +00:00
s3c24xx-i2s.c ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream 2010-03-19 19:37:29 +00:00
s3c24xx-i2s.h ALSA: asoc: s3c24xx - merge structs snd_soc_codec_dai and snd_soc_cpu_dai. 2008-07-10 09:32:45 +02:00
s3c24xx_simtec.c const: constify remaining dev_pm_ops 2009-12-15 08:53:25 -08:00
s3c24xx_simtec.h const: constify remaining dev_pm_ops 2009-12-15 08:53:25 -08:00
s3c24xx_simtec_hermes.c ASoC: Rename 's3c24xx-pcm' driver to 's3c-dma' 2009-11-18 13:35:03 +00:00
s3c24xx_simtec_tlv320aic23.c ASoC: Rename 's3c24xx-pcm' driver to 's3c-dma' 2009-11-18 13:35:03 +00:00
s3c24xx_uda134x.c ASoC: Rename 's3c24xx-pcm' driver to 's3c-dma' 2009-11-18 13:35:03 +00:00
s3c64xx-i2s-v4.c ASoC: S3C64XX: IISv4: Add CPU driver 2010-05-07 16:45:41 +01:00
s3c64xx-i2s.c ASoC: S3C: I2S: Move set_sysclk to common code 2010-05-05 15:15:14 +01:00
s3c64xx-i2s.h ASoC: S3C64XX: IISv4: Add CPU driver 2010-05-07 16:45:41 +01:00
s3c2412-i2s.c ASoC: S3C: I2S: Move set_sysclk to common code 2010-05-05 15:15:14 +01:00
s3c2412-i2s.h ASoC: S3C: I2Sv2: Unify i2s_get_clock callback 2010-05-05 15:13:20 +01:00
smartq_wm8987.c ASoC: Invert speaker enabling behaviour in SmartQ sound driver 2010-07-06 23:54:06 +09:00
smdk64xx_wm8580.c ASoC: SMDK64XX: Switch to IISv4 CPU driver 2010-05-07 16:46:06 +01:00
smdk2443_wm9710.c ASoC: AC97: SMDK2443: Switch to s3c-ac97.c 2010-01-27 20:49:49 +00:00
smdk_wm9713.c ASOC: S5PV210: Enable AC97 support 2010-05-27 04:05:49 -04:00