Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346363
b: refs/heads/master
c: 5909c65
h: refs/heads/master
i:
  346361: 1af8874
  346359: 1654a56
v: v3
  • Loading branch information
Corentin Chary authored and Linus Torvalds committed Dec 18, 2012
1 parent 9b03922 commit 8c0b2c8
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ba28853daa2912dff9b42fbc477af8ea27ef8ad0
refs/heads/master: 5909c654a6f20dd61cc5ac952f8eaa3a29e59078
4 changes: 2 additions & 2 deletions trunk/MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,7 @@ F: Documentation/hwmon/asc7621
F: drivers/hwmon/asc7621.c

ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
M: Corentin Chary <corentincj@iksaif.net>
M: Corentin Chary <corentin.chary@gmail.com>
L: acpi4asus-user@lists.sourceforge.net
L: platform-driver-x86@vger.kernel.org
W: http://acpi4asus.sf.net
Expand Down Expand Up @@ -6490,7 +6490,7 @@ F: drivers/media/pci/saa7146/
F: include/media/saa7146*

SAMSUNG LAPTOP DRIVER
M: Corentin Chary <corentincj@iksaif.net>
M: Corentin Chary <corentin.chary@gmail.com>
L: platform-driver-x86@vger.kernel.org
S: Maintained
F: drivers/platform/x86/samsung-laptop.c
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/platform/x86/asus-nb-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#define ASUS_NB_WMI_FILE "asus-nb-wmi"

MODULE_AUTHOR("Corentin Chary <corentincj@iksaif.net>");
MODULE_AUTHOR("Corentin Chary <corentin.chary@gmail.com>");
MODULE_DESCRIPTION("Asus Notebooks WMI Hotkey Driver");
MODULE_LICENSE("GPL");

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/platform/x86/asus-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

#include "asus-wmi.h"

MODULE_AUTHOR("Corentin Chary <corentincj@iksaif.net>, "
MODULE_AUTHOR("Corentin Chary <corentin.chary@gmail.com>, "
"Yong Wang <yong.y.wang@intel.com>");
MODULE_DESCRIPTION("Asus Generic WMI Driver");
MODULE_LICENSE("GPL");
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/platform/x86/eeepc-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

#define EEEPC_WMI_FILE "eeepc-wmi"

MODULE_AUTHOR("Corentin Chary <corentincj@iksaif.net>");
MODULE_AUTHOR("Corentin Chary <corentin.chary@gmail.com>");
MODULE_DESCRIPTION("Eee PC WMI Hotkey Driver");
MODULE_LICENSE("GPL");

Expand Down

0 comments on commit 8c0b2c8

Please sign in to comment.