aboutsummaryrefslogtreecommitdiffstats
path: root/arch/hexagon/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-06-28 13:13:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-06-28 13:13:48 -0700
commitcf723497f2b0dfd688dd27949f1d6e26a5aec44c (patch)
treef1c760a700ff5fe97f9169eace297b923009a237 /arch/hexagon/Makefile
parentMerge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm (diff)
parentdrm/etnaviv: Fix implicit/explicit sync sense inversion (diff)
downloadlinux-dev-cf723497f2b0dfd688dd27949f1d6e26a5aec44c.tar.xz
linux-dev-cf723497f2b0dfd688dd27949f1d6e26a5aec44c.zip
Merge branch 'etnaviv/fixes' of git://git.pengutronix.de/git/lst/linux
Pull drm/etnaviv fixes from Lucas Stach: "I realized I just missed the cut-off point for the final drm fixes pull, but I have 2 more etnaviv fixes that need to go into 4.12, as they fix fallout from the explicit sync work introduced in the last merge window" [ Pulling directly because Dave is on vacation. Noted by Daniel Vetter, and acked by Dave Airlie - Linus ] * 'etnaviv/fixes' of git://git.pengutronix.de/git/lst/linux: drm/etnaviv: Fix implicit/explicit sync sense inversion drm/etnaviv: fix submit flags getting overwritten by BO content
Diffstat (limited to 'arch/hexagon/Makefile')
0 files changed, 0 insertions, 0 deletions