diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 13:24:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 13:24:37 -0700 |
| commit | 95b18e69950ca7fd9acfa55964e929f58bec9379 (patch) | |
| tree | 5168f81b49cdfa2bcf363e4bd86cbfd669493ebd /arch/cris/include/asm/unistd.h | |
| parent | 6d8a97af63222c5cbc7fe63ae19345e74e153e90 (diff) | |
| parent | 6a743897144500fb4c4566ced3a498d5180fbb5b (diff) | |
Merge tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
Pull virtio update from Rusty Russell:
"Virtio patches, mainly hotplugging fixes."
* tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
virtio-blk: return VIRTIO_BLK_F_FLUSH to header.
virtio-blk: allow toggling host cache between writeback and writethrough
virtio-blk: Use block layer provided spinlock
virtio-blk: Reset device after blk_cleanup_queue()
virtio-blk: Call del_gendisk() before disable guest kick
virtio: rng: s3/s4 support
virtio: rng: split out common code in probe / remove for s3/s4 ops
virtio: rng: don't wait on host when module is going away
virtio: rng: allow tasks to be killed that are waiting for rng input
virtio ids: fix comment for virtio-rng
Diffstat (limited to 'arch/cris/include/asm/unistd.h')
0 files changed, 0 insertions, 0 deletions