diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-03-02 23:22:03 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-03-02 23:22:03 +0100 |
| commit | f777ba1780584b100ab9664cc06d04f3bb273a84 (patch) | |
| tree | 865813eb0078530ca3b036c0c3eee6ce33f9315f /drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h | |
| parent | ARM: dts: am43xx: add support for parallel NAND flash (diff) | |
| parent | ARM: dts: omap4+: Add DMM bindings (diff) | |
| download | linux-f777ba1780584b100ab9664cc06d04f3bb273a84.tar.xz linux-f777ba1780584b100ab9664cc06d04f3bb273a84.zip | |
Merge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.15/dt
Add craneboard devices
Add more N900 devices
Add am43x-epos-evm and am437x-gp-evm devices
Add OMAP4 DMM devices
Conflicts:
arch/arm/boot/dts/am43x-epos-evm.dts
arch/arm/boot/dts/dra7.dtsi
Diffstat (limited to 'drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h')
| -rw-r--r-- | drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h b/drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h index a57a45ffb9e4..465762145ad2 100644 --- a/drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h +++ b/drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h @@ -1,7 +1,7 @@ /* * mxl111sf-i2c.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 |