]> git.hungrycats.org Git - linux/commitdiff
Merge remote-tracking branch 'stable/linux-4.15.y' into zygo-4.15.x-zb64
authorZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Sun, 8 Apr 2018 20:42:39 +0000 (16:42 -0400)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Sun, 8 Apr 2018 20:42:39 +0000 (16:42 -0400)
1  2 
Makefile

diff --cc Makefile
Simple merge