From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 19 Sep 2012 18:03:13 +0000 (-0700)
Subject: Merge tag 'rpmsg-3.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cf42d543e54143fbbaaa9972c5e69bc21a0b77dd;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge tag 'rpmsg-3.6-fix' of git://git./linux/kernel/git/ohad/rpmsg

Pull rpmsg fix from Ohad Ben-Cohen:
 "A quick rpmsg fix from Fernando, fixing two buggy invocations of
  dma_free_coherent"

* tag 'rpmsg-3.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg:
  rpmsg: fix dma_free_coherent dev parameter
---

cf42d543e54143fbbaaa9972c5e69bc21a0b77dd