linux/sound/soc
Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
2011-11-06 19:44:47 -08: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 sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
codecs Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08: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 sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
fsl ASoC: fsl: Fix error handling if platform_device_add fails 2011-09-20 12:58:59 +01:00
imx sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04: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 sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04: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 sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
pxa sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
s6000 ASoC: s6000-pcm: remove unused variable 'dai' 2011-08-15 22:51:48 +09:00
samsung Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
sh sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
tegra sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04: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 sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed 2011-10-31 19:31:22 -04: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 sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed 2011-10-31 19:31:22 -04:00
soc-jack.c sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed 2011-10-31 19:31:22 -04: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 sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed 2011-10-31 19:31:22 -04:00