diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-12 11:13:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-12 11:13:31 -0800 |
| commit | 05f3f415894d061f7d3e77e3d46caeb4c184b005 (patch) | |
| tree | d49254d7ae4759ab85a2944843f73adaa6865e0a /include/asm-cris/spinlock.h | |
| parent | e697b8d13ede3893724898d983eff3f8c9183643 (diff) | |
| parent | 42b36cc0ce717deeb10030141a43dede763a3ebe (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-virtio
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-virtio:
virtio: Force use of power-of-two for descriptor ring sizes
lguest: Fix lguest virtio-blk backend size computation
virtio: Fix used_idx wrap-around
virtio: more fallout from scatterlist changes.
virtio: fix vring_init for 64 bits
Diffstat (limited to 'include/asm-cris/spinlock.h')
0 files changed, 0 insertions, 0 deletions