From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 17 Mar 2008 16:52:19 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
X-Git-Tag: v2.6.25-rc7~114
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=84841384ec6ec57544b76e564514d3f9eb6c1901;p=safe%2Fjmp%2Flinux-2.6

Merge git://git./linux/kernel/git/rusty/linux-2.6-for-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  virtio: fix race in enable_cb
  virtio: Enable netpoll interface for netconsole logging
  virtio: handle > 2 billion page balloon targets
  virtio: Fix sysfs bits to have proper block symlink
  virtio: Use spin_lock_irqsave/restore for virtio-pci
---

84841384ec6ec57544b76e564514d3f9eb6c1901