tree a57e83edadf6cd34b1966c7e10d7ef6de4bf5313
parent 8dec00059ef1db9f58719186366b71c8afbc4d1e
parent fbcb44dea89063d72a1242086f4a0c618e0d1e81
author Linus Torvalds <torvalds@linux-foundation.org> 1295366635 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1295366635 -0800

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/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