| commit | 552c7dbb3459c219e44a65fd6bca21b1227c0e33 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 05 13:49:37 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 05 13:49:37 2010 -0700 |
| tree | 686c62c2821e687c73754c29145bca4e55f45224 | |
| parent | db7a1535d2dcf91115ba0fb940b1902c05305843 [diff] | |
| parent | 6c99a8528f9a81dda6bbbf83854b8475ce79c745 [diff] |
Merge branch 'virtio' of git://git.kernel.org/pub/scm/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