From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Aug 2010 20:49:37 +0000 (-0700)
Subject: Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=552c7dbb3459c219e44a65fd6bca21b1227c0e33;p=openwrt%2Fstaging%2Fblogic.git

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

* 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  virtio_blk: Remove VBID ioctl
  virtio_blk: Add 'serial' attribute to virtio-blk devices (v2)
  virtio_blk: support barriers without FLUSH feature
---

552c7dbb3459c219e44a65fd6bca21b1227c0e33