From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Jan 2011 16:03:55 +0000 (-0800)
Subject: Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: upstream/snapshot3+hdmi~11675
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34c682adb30e9602e92f044056c142f69b4a6cfe;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 's5p-fixes-for-linus' of git://git./linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S5PV310: Add missing virtual ASoC DMA device
  ARM: S5PV210: Add missing virtual ASoC DMA device
  ARM: S5P6450: Add missing virtual ASoC DMA device
  ARM: S5P6440: Add missing virtual ASoC DMA device
  ARM: S5P6442: Enable I2S device to work on SMDK6442
---

34c682adb30e9602e92f044056c142f69b4a6cfe