summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-09 11:51:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-09 11:51:40 -0800
commitd3d373e0e3f51f335d8c722dd1340ab812fdf94b (patch)
tree766175dfbbd5688f77e69fe43c835865fd864d2d /include
parentaceb91cd351bc3a19a783c901fe8a8070d5f6fa9 (diff)
parent5084f89303c0a138f66bf74662753f46878989bb (diff)
downloadlinux-d3d373e0e3f51f335d8c722dd1340ab812fdf94b.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: virtio: console: Update Copyright virtio: console: Wake up outvq on host notifications
Diffstat (limited to 'include')
-rw-r--r--include/linux/virtio_console.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/virtio_console.h b/include/linux/virtio_console.h
index a85064db8f94..e4d333543a33 100644
--- a/include/linux/virtio_console.h
+++ b/include/linux/virtio_console.h
@@ -7,7 +7,8 @@
* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so
* anyone can use the definitions to implement compatible drivers/servers.
*
- * Copyright (C) Red Hat, Inc., 2009, 2010
+ * Copyright (C) Red Hat, Inc., 2009, 2010, 2011
+ * Copyright (C) Amit Shah <amit.shah@redhat.com>, 2009, 2010, 2011
*/
/* Feature bits */