mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 13:44:26 -04:00
Merge branch 'master' into upstream-fixes
This commit is contained in:
commit
e47b207a5b
153 changed files with 5485 additions and 1760 deletions
|
|
@ -59,7 +59,7 @@
|
|||
#include <asm/byteorder.h>
|
||||
#include <asm/unaligned.h>
|
||||
|
||||
MODULE_AUTHOR("Stephen Hemminger <shemminger@osdl.org>");
|
||||
MODULE_AUTHOR("Stephen Hemminger <shemminger@linux-foundation.org>");
|
||||
MODULE_DESCRIPTION("IrDA-USB Dongle Driver for SigmaTel STIr4200");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
#define LINK_HZ (HZ/2)
|
||||
|
||||
MODULE_DESCRIPTION("SysKonnect Gigabit Ethernet driver");
|
||||
MODULE_AUTHOR("Stephen Hemminger <shemminger@osdl.org>");
|
||||
MODULE_AUTHOR("Stephen Hemminger <shemminger@linux-foundation.org>");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION(DRV_VERSION);
|
||||
|
||||
|
|
|
|||
|
|
@ -3691,6 +3691,6 @@ module_init(sky2_init_module);
|
|||
module_exit(sky2_cleanup_module);
|
||||
|
||||
MODULE_DESCRIPTION("Marvell Yukon 2 Gigabit Ethernet driver");
|
||||
MODULE_AUTHOR("Stephen Hemminger <shemminger@osdl.org>");
|
||||
MODULE_AUTHOR("Stephen Hemminger <shemminger@linux-foundation.org>");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION(DRV_VERSION);
|
||||
|
|
|
|||
Loading…
Reference in a new issue