summaryrefslogtreecommitdiff
path: root/include/uapi/drm/armada_drm.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/uapi/drm/armada_drm.h')
0 files changed, 0 insertions, 0 deletions
f9ccd478ac57c3a3a0764b'>net/xfrm/xfrm_user.c parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)parenteeeefd41843218c55a8782a6920f044d9bf6207a (diff)
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fix from Jens Axboe: "A single fix that should go into 4.10, fixing a regression on some devices with the WRITE_SAME command" * 'for-linus' of git://git.kernel.dk/linux-block: block: don't try Write Same from __blkdev_issue_zeroout
Diffstat (limited to 'net/xfrm/xfrm_user.c')