diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /drivers/base/hypervisor.c | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/base/hypervisor.c')
| -rw-r--r-- | drivers/base/hypervisor.c | 3 |
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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * hypervisor.c - /sys/hypervisor subsystem. | 2 | * hypervisor.c - /sys/hypervisor subsystem. |
| 3 | * | 3 | * |
| 4 | * This file is released under the GPLv2 | 4 | * Copyright (C) IBM Corp. 2006 |
| 5 | * | 5 | * |
| 6 | * This file is released under the GPLv2 | ||
| 6 | */ | 7 | */ |
| 7 | 8 | ||
| 8 | #include <linux/kobject.h> | 9 | #include <linux/kobject.h> |