Merge tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Jul 2012 20:39:56 +0000 (13:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Jul 2012 20:39:56 +0000 (13:39 -0700)
commitc5e43b83b0e2a5a24f7a2f1417e08db063b034f7
treecb6d1dd1e537319fef27f6da24d8408b8ee57e5c
parent6f5410b688c6326a3a54feffed5119987187c357
parent9c378abc5c0c6fc8e3acf5968924d274503819b3
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