linux-sg2042/sound/soc/ep93xx
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
..
Kconfig ASoC: EDB93xx machine sound driver with CS4271 2011-01-24 12:05:15 +00:00
Makefile ASoC: EDB93xx machine sound driver with CS4271 2011-01-24 12:05:15 +00:00
edb93xx.c ASoC: EDB93xx: Manage I2S rates according to datasheet for CS4271 CODEC. 2011-03-09 13:08:32 +00:00
ep93xx-ac97.c ASoC: ep93xx: convert to use the DMA engine API 2011-06-08 15:45:59 -06:00
ep93xx-i2s.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
ep93xx-pcm.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
ep93xx-pcm.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
simone.c ASoC: simone: fix resource leak in simone_init error path 2010-11-25 11:09:30 +00:00
snappercl15.c Change Ryan Mallon's email address across the kernel 2011-06-16 11:22:05 +02:00