summaryrefslogtreecommitdiffstats
path: root/drivers/base/hypervisor.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-24 07:52:47 +0200
committerJeff Garzik <jeff@garzik.org>2006-09-24 07:52:47 +0200
commit23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch)
tree36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /drivers/base/hypervisor.c
parent[libata] Delete pata_it8172 driver (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff)
downloadlinux-23930fa1cebfea6f79881c588ccd1b0781e49e3f.tar.xz
linux-23930fa1cebfea6f79881c588ccd1b0781e49e3f.zip
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/base/hypervisor.c')
-rw-r--r--drivers/base/hypervisor.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/hypervisor.c b/drivers/base/hypervisor.c
index 0c85e9d6a448..7080b413ddc9 100644
--- a/drivers/base/hypervisor.c
+++ b/drivers/base/hypervisor.c
@@ -1,8 +1,9 @@
/*
* hypervisor.c - /sys/hypervisor subsystem.
*
- * This file is released under the GPLv2
+ * Copyright (C) IBM Corp. 2006
*
+ * This file is released under the GPLv2
*/
#include <linux/kobject.h>