diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-09 16:51:46 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-09 16:51:46 +0900 |
commit | 5c4986b8a9ddd9cf649abe38a102866f7809b1d2 (patch) | |
tree | cdab5ebea615534a03194f5d85f76c3468b0183d /drivers/virtio/virtio_ring.c | |
parent | a9b27bcc6acf2491609f51aa592ec67311d4518d (diff) | |
parent | 37b7a97884ba64bf7d403351ac2a9476ab4f1bba (diff) | |
parent | 99870bd784ff9eb2405eab060125c0ded74968cd (diff) | |
download | blackbird-op-linux-5c4986b8a9ddd9cf649abe38a102866f7809b1d2.tar.gz blackbird-op-linux-5c4986b8a9ddd9cf649abe38a102866f7809b1d2.zip |
Merge branches 'sh/core', 'sh/io-overhaul' and 'sh/urgent' into sh-latest