diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-03 12:49:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-03 12:49:12 +1100 |
| commit | bfcb5716cfef583ff1fa84f3fa1f4ec04e90a8f3 (patch) | |
| tree | 0746a2f0ae87f3d6239af4db51a9f5c206b3fbaa /include | |
| parent | a2a4f1edc0738c1518330fb0057edac18f9729af (diff) | |
| parent | 2dcbcf9303923178107c2b9a3d012223cdd9bebb (diff) | |
Merge branch 'quilt/rr'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/virtio_console.h | 3 |
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 */ |