linux/sound/soc/fsl
Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
2011-07-25 13:56:39 -07:00
..
efika-audio-fabric.c ASoC: efika-audio-fabric: fix resource leak in efika_fabric_init error path 2010-11-25 11:08:13 +00:00
fsl_dma.c Merge branch 'for-3.0' into for-3.1 2011-06-09 12:02:26 +01:00
fsl_dma.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
fsl_ssi.c trivial: don't touch fsi_ssl.c with ioremap fixes 2011-06-14 10:40:40 +02:00
fsl_ssi.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
Kconfig ASoC: add support for the Freescale P1022 DS reference board 2010-08-20 12:14:48 +01:00
Makefile ASoC: add support for the Freescale P1022 DS reference board 2010-08-20 12:14:48 +01:00
mpc5200_dma.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-07-25 13:56:39 -07:00
mpc5200_dma.h Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
mpc5200_psc_ac97.c dt/sound: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
mpc5200_psc_ac97.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
mpc5200_psc_i2s.c dt/sound: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
mpc8610_hpcd.c ASoC: p1022ds: fix incorrect referencing of device tree properties 2011-06-09 12:02:08 +01:00
p1022_ds.c ASoC: p1022ds: fix incorrect referencing of device tree properties 2011-06-09 12:02:08 +01:00
pcm030-audio-fabric.c ASoC: pcm030-audio-fabric: fix resource leak in pcm030_fabric_init error path 2010-11-25 11:08:25 +00:00