]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commit
Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Jun 2019 06:27:01 +0000 (08:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Jun 2019 06:27:01 +0000 (08:27 +0200)
commitdd3bf0a12237a23a0563718cacad6b9d8626e6ee
treed6ea1e5a8de18b1ad335dff1eee3b98a34f07bd5
parent7fe4edc7677aaa970d8c698852faab053c3649cc
parent320db32b25ea0ab2d943852602d178c926446ac8
Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue

Handle merge conflict in series files between me and Sasha
queue-4.14/series
queue-4.19/series
queue-4.4/series
queue-4.9/series
queue-5.1/series