diff options
author | Grant Likely <grant.likely@linaro.org> | 2014-03-04 09:44:10 +0100 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2014-03-04 09:44:10 +0100 |
commit | dab2310d9d90eded48625c5382c6a60389bf8ca9 (patch) | |
tree | 9327cc815d69dec23aebf03407e3fa82b6d2fbaa /drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h | |
parent | Revert "of: fix of_update_property()" (diff) | |
parent | Linux 3.14-rc5 (diff) | |
download | linux-dab2310d9d90eded48625c5382c6a60389bf8ca9.tar.xz linux-dab2310d9d90eded48625c5382c6a60389bf8ca9.zip |
Merge tag 'v3.14-rc5' into HEAD
Linux 3.14-rc5
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 |