summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-03 15:45:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-03 15:45:03 -0700
commit636667a545b2d16797f27002a65d688c195c9b60 (patch)
tree3acfe7b5aefc4f71d484a5186365963c51a70314 /include
parentceadda057c000fa82e6bbe508923d8181414dea7 (diff)
parent60e5e0b84045ce0f6ab07a02c7fcd6627b53d2d3 (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: console: Fix crash when port is unplugged and blocked for write virtio: console: Fix crash when hot-unplugging a port and read is blocked virtio-blk: fix minimum number of S/G elements
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions