diff options
author | 2017-04-03 12:01:20 -0700 | |
---|---|---|
committer | 2017-04-03 12:01:20 -0700 | |
commit | 03b22057e8ed2d1df416c9ae8e6e247e0b87ecc8 (patch) | |
tree | cd89bdd4053e46ff3cbd67adeffa24310c04e725 /drivers/media/pci/zoran/videocodec.h | |
parent | Input: silead - list all supported compatible strings in binding document (diff) | |
parent | Linux 4.11-rc5 (diff) | |
download | linux-dev-03b22057e8ed2d1df416c9ae8e6e247e0b87ecc8.tar.xz linux-dev-03b22057e8ed2d1df416c9ae8e6e247e0b87ecc8.zip |
Merge tag 'v4.11-rc5' into next
Sync up with mainline to bring in changes to input subsystem merged
through other trees.
Diffstat (limited to 'drivers/media/pci/zoran/videocodec.h')
-rw-r--r-- | drivers/media/pci/zoran/videocodec.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/pci/zoran/videocodec.h b/drivers/media/pci/zoran/videocodec.h index def55585ad23..8ed5a0f7ac01 100644 --- a/drivers/media/pci/zoran/videocodec.h +++ b/drivers/media/pci/zoran/videocodec.h @@ -20,10 +20,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * * ------------------------------------------------------------------------ */ |