From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Jul 2012 20:39:56 +0000 (-0700)
Subject: Merge tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty... 
X-Git-Tag: upstream/snapshot3+hdmi~7114
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5e43b83b0e2a5a24f7a2f1417e08db063b034f7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'virtio-for-linus' of git://git./linux/kernel/git/rusty/linux-2.6-for-linus

Pull minor virtio-balloon fix from Rusty Russell:
 "Theoretical fix, which greatly simplifies upcoming balloon patches
  which will go in via some vm tree."

* tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  virtio-balloon: fix add/get API use
---

c5e43b83b0e2a5a24f7a2f1417e08db063b034f7