summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2016-02-20 02:58:43 +0200
committerLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2016-02-20 02:58:43 +0200
commit4c4400504f6ada0cfed682fbe7e6c65efbda3952 (patch)
tree5452eb39c76081fc871abdf1a38ccf3668f5cb4f /drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
parentd2eaa59000c7717e68a75cf2c106f056d2bc30b4 (diff)
parent18922936dc2817488ebba985c5aaf3498f2ef96d (diff)
downloadtalos-obmc-linux-4c4400504f6ada0cfed682fbe7e6c65efbda3952.tar.gz
talos-obmc-linux-4c4400504f6ada0cfed682fbe7e6c65efbda3952.zip
Merge remote-tracking branch 'linuxtv/vsp1' into HEAD
Diffstat (limited to 'drivers/media/usb/dvb-usb-v2/dvb_usb_common.h')
-rw-r--r--drivers/media/usb/dvb-usb-v2/dvb_usb_common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_common.h b/drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
index 45f07090d431..a1622bda2a5e 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
@@ -1,7 +1,7 @@
/*
* DVB USB framework
*
- * Copyright (C) 2004-6 Patrick Boettcher <patrick.boettcher@desy.de>
+ * Copyright (C) 2004-6 Patrick Boettcher <patrick.boettcher@posteo.de>
* Copyright (C) 2012 Antti Palosaari <crope@iki.fi>
*
* This program is free software; you can redistribute it and/or modify
OpenPOWER on IntegriCloud