Merge tag 'rpmsg-3.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Sep 2012 18:03:13 +0000 (11:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Sep 2012 18:03:13 +0000 (11:03 -0700)
commitcf42d543e54143fbbaaa9972c5e69bc21a0b77dd
tree19b99843dfe17185f4ccb81489536efcad1d2262
parent4b92c17e1dc10b6fec44241228c695ef93b504ea
parenteeb0074f36d1ab0729d06f1c56add9c7799679e2
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