tree 3af1373f62d3f15c2473bf1034757cd1d0122c0b
parent 3d10a15d6919488204bdb264050d156ced20d9aa
parent 4265f161b6bb7b31163671329b1142b9023bf4e3
author Linus Torvalds <torvalds@linux-foundation.org> 1205772739 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1205772739 -0700

Merge git://git.kernel.org/pub/scm/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