diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-11-15 16:56:11 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-11-15 16:56:11 -0800 |
| commit | 4247f24c23589bcc3bc3490515ef8c9497e9ae55 (patch) | |
| tree | 89726a0e171c443a3e8def2992b56dbd8a21df21 /drivers/media/rc/ir-sharp-decoder.c | |
| parent | 79ab67ede21f536851a99ea68ee6fc1f5435e055 (diff) | |
| parent | 9f586fff6574f6ecbf323f92d44ffaf0d96225fe (diff) | |
Merge branch 'for-4.15/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/media/rc/ir-sharp-decoder.c')
| -rw-r--r-- | drivers/media/rc/ir-sharp-decoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/ir-sharp-decoder.c b/drivers/media/rc/ir-sharp-decoder.c index ed43a4212479..129b558acc92 100644 --- a/drivers/media/rc/ir-sharp-decoder.c +++ b/drivers/media/rc/ir-sharp-decoder.c @@ -245,5 +245,5 @@ module_init(ir_sharp_decode_init); module_exit(ir_sharp_decode_exit); MODULE_LICENSE("GPL"); -MODULE_AUTHOR("James Hogan <james.hogan@imgtec.com>"); +MODULE_AUTHOR("James Hogan <jhogan@kernel.org>"); MODULE_DESCRIPTION("Sharp IR protocol decoder"); |