path: root/mm
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-02 15:00:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-02 15:00:56 -0700
commit80c2861672bbf000f6af838656959ee937e4ee4d (patch)
tree78b361fd7278d461b1e664272f3b27660b64c642 /mm
parentd211858837ff8d8e31942ca7d27e6e08b3b46f5e (diff)
parent5087a50e66bd51b6e72c60bce4757a42b93f6b2c (diff)
Merge git://github.com/rustyrussell/linux
* git://github.com/rustyrussell/linux: virtio-blk: use ida to allocate disk index virtio: Add platform bus driver for memory mapped virtio device virtio: Dont add "config" to list for !per_vq_vector virtio: console: wait for first console port for early console output virtio: console: add port stats for bytes received, sent and discarded virtio: console: make discard_port_data() use get_inbuf() virtio: console: rename variable virtio: console: make get_inbuf() return port->inbuf if present virtio: console: Fix return type for get_inbuf() virtio: console: Use wait_event_freezable instead of _interruptible virtio: console: Ignore port name update request if name already set virtio: console: Fix indentation virtio: modify vring_init and vring_size to take account of the layout containing *_event_idx virtio.h: correct comment for struct virtio_driver virtio-net: Use virtio_config_val() for retrieving config virtio_config: Add virtio_config_val_len() virtio-console: Use virtio_config_val() for retrieving config
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions