diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-30 12:23:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-30 12:23:30 -0500 |
| commit | c43e0e46adf79c321ed3fbf0351e1005fb8a2413 (patch) | |
| tree | 35b9ab361651f649d3c9aa69f159812eba50d154 /drivers/misc/hpilo.c | |
| parent | dba3d36b2f0842ed7f25c33cd3a2ccdb3d0df9db (diff) | |
| parent | f2257b70b0f9b2fe8f2afd83fc6798dca75930b8 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
kernel/irq/handle.c
Diffstat (limited to 'drivers/misc/hpilo.c')
| -rw-r--r-- | drivers/misc/hpilo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c index 05e298289238..10c421b73eaf 100644 --- a/drivers/misc/hpilo.c +++ b/drivers/misc/hpilo.c | |||
| @@ -758,7 +758,7 @@ static void __exit ilo_exit(void) | |||
| 758 | class_destroy(ilo_class); | 758 | class_destroy(ilo_class); |
| 759 | } | 759 | } |
| 760 | 760 | ||
| 761 | MODULE_VERSION("0.05"); | 761 | MODULE_VERSION("0.06"); |
| 762 | MODULE_ALIAS(ILO_NAME); | 762 | MODULE_ALIAS(ILO_NAME); |
| 763 | MODULE_DESCRIPTION(ILO_NAME); | 763 | MODULE_DESCRIPTION(ILO_NAME); |
| 764 | MODULE_AUTHOR("David Altobelli <david.altobelli@hp.com>"); | 764 | MODULE_AUTHOR("David Altobelli <david.altobelli@hp.com>"); |