mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits) fix do_sys_open() prototype sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake Documentation: Fix typo in SubmitChecklist. Typo: depricated -> deprecated Add missing profile=kvm option to Documentation/kernel-parameters.txt fix typo about TBI in e1000 comment proc.txt: Add /proc/stat field small documentation fixes Fix compiler warning in smount example program from sharedsubtree.txt docs/sysfs: add missing word to sysfs attribute explanation documentation/ext3: grammar fixes Documentation/java.txt: typo and grammar fixes Documentation/filesystems/vfs.txt: typo fix include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros trivial copy_data_pages() tidy up Fix typo in arch/x86/kernel/tsc_32.c file link fix for Pegasus USB net driver help remove unused return within void return function Typo fixes retrun -> return x86 hpet.h: remove broken links ...
This commit is contained in:
commit
c00046c279
515 changed files with 879 additions and 943 deletions
|
|
@ -2,7 +2,7 @@
|
|||
gl520sm.c - Part of lm_sensors, Linux kernel modules for hardware
|
||||
monitoring
|
||||
Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl>,
|
||||
Kyösti Mälkki <kmalkki@cc.hut.fi>
|
||||
Kyösti Mälkki <kmalkki@cc.hut.fi>
|
||||
Copyright (c) 2005 Maarten Deprez <maartendeprez@users.sourceforge.net>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -805,7 +805,7 @@ static void __exit sensors_gl520sm_exit(void)
|
|||
|
||||
|
||||
MODULE_AUTHOR("Frodo Looijaard <[email protected]>, "
|
||||
"Kyösti Mälkki <[email protected]>, "
|
||||
"Kyösti Mälkki <[email protected]>, "
|
||||
"Maarten Deprez <[email protected]>");
|
||||
MODULE_DESCRIPTION("GL520SM driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
for hardware monitoring
|
||||
|
||||
Copyright (C) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>,
|
||||
Kyösti Mälkki <kmalkki@cc.hut.fi>, and
|
||||
Kyösti Mälkki <kmalkki@cc.hut.fi>, and
|
||||
Mark D. Studebaker <mdsxyz123@yahoo.com>
|
||||
Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with
|
||||
the help of Jean Delvare <khali@linux-fr.org>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
for hardware monitoring
|
||||
|
||||
Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>,
|
||||
Kyösti Mälkki <kmalkki@cc.hut.fi>,
|
||||
Kyösti Mälkki <kmalkki@cc.hut.fi>,
|
||||
Mark Studebaker <mdsxyz123@yahoo.com>,
|
||||
and Bob Dougherty <bobd@stanford.edu>
|
||||
(Some conversion-factor data were contributed by Jonathan Teh Soon Yew
|
||||
|
|
@ -866,7 +866,7 @@ static void __exit sm_via686a_exit(void)
|
|||
}
|
||||
}
|
||||
|
||||
MODULE_AUTHOR("Kyösti Mälkki <[email protected]>, "
|
||||
MODULE_AUTHOR("Kyösti Mälkki <[email protected]>, "
|
||||
"Mark Studebaker <[email protected]> "
|
||||
"and Bob Dougherty <[email protected]>");
|
||||
MODULE_DESCRIPTION("VIA 686A Sensor device");
|
||||
|
|
|
|||
Loading…
Reference in a new issue