tree 255d7e793cf75d6ebcd52f8c8fc6683bae398cf6
parent 1110afbe728838ac7ce973c37af9e11385dbaef9
parent d4e54e871f4d2ca29df081abf8e0d5209d252979
author Takashi Iwai <tiwai@suse.de> 1253214533 +0200
committer Takashi Iwai <tiwai@suse.de> 1253214533 +0200

Merge branch 'fix/asoc' into for-linus

* fix/asoc:
  ASoC: remove unused #include <linux/version.h>
  ASoC: S3C lrsync function made to work with IRQs disabled.
  ASoC: Fix display of stream name in DAPM debugfs
  ASoC: Clean up error handling in MPC5200 DMA setup