Merge branch 'master' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds...
authorJuergen Gross <jgross@suse.com>
Mon, 29 Jan 2018 14:54:46 +0000 (15:54 +0100)
committerJuergen Gross <jgross@suse.com>
Mon, 29 Jan 2018 14:54:46 +0000 (15:54 +0100)

Trivial merge