diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-25 15:12:17 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-25 15:12:17 +0400 |
commit | d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902 (patch) | |
tree | 4fe17a547c8c4e403c18cdc6a6c5e30c6f437bc9 /drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h | |
parent | bf68665d7a5647591258c120382fd64465db7d63 (diff) | |
parent | 37c367ecdb9a01c9acc980e6e17913570a1788a7 (diff) | |
download | linux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.tar.xz |
Merge branch 'for-linus' into HEAD
Diffstat (limited to 'drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h')
-rw-r--r-- | drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h b/drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h index 0220f54299a5..b85a5772d771 100644 --- a/drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h +++ b/drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h @@ -1,7 +1,7 @@ /* * mxl111sf-gpio.h - driver for the MaxLinear MXL111SF * - * Copyright (C) 2010 Michael Krufky <mkrufky@kernellabs.com> + * Copyright (C) 2010-2014 Michael Krufky <mkrufky@linuxtv.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |