Merge remote-tracking branch 'kraxel/usb.37' into staging

[mirror_qemu.git] / hw / ivshmem.c

diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index 1aa9e3bfa13c2e04cd071620abdfd77906996496..bec2e0b8fe585c30295a3f5c4b3fb3331c68b4a7 100644 (file)
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -12,6 +12,9 @@
  *          Copyright (c) 2006 Igor Kovalenko
  *
  * This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
  */
 #include "hw.h"
 #include "pc.h"