diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2019-07-28 22:22:40 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2019-07-28 22:22:40 +0200 |
commit | 7a30bdd99f37352b188575b27924c407c6ddff9e (patch) | |
tree | 10ea40ab1b5211e75c33eaddb3a6b393ad6ee7ad /Documentation/media/uapi/cec/cec-api.rst | |
parent | x86/speculation/swapgs: Exclude ATOMs from speculation through SWAPGS (diff) | |
parent | Linux 5.3-rc2 (diff) | |
download | linux-dev-7a30bdd99f37352b188575b27924c407c6ddff9e.tar.xz linux-dev-7a30bdd99f37352b188575b27924c407c6ddff9e.zip |
Merge branch master from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Pick up the spectre documentation so the Grand Schemozzle can be added.
Diffstat (limited to 'Documentation/media/uapi/cec/cec-api.rst')
-rw-r--r-- | Documentation/media/uapi/cec/cec-api.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/media/uapi/cec/cec-api.rst b/Documentation/media/uapi/cec/cec-api.rst index b614bf81aa20..0780ba07995a 100644 --- a/Documentation/media/uapi/cec/cec-api.rst +++ b/Documentation/media/uapi/cec/cec-api.rst @@ -39,7 +39,7 @@ Revision and Copyright ********************** Authors: -- Verkuil, Hans <hans.verkuil@cisco.com> +- Verkuil, Hans <hverkuil-cisco@xs4all.nl> - Initial version. |