summaryrefslogtreecommitdiffstats
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-07 13:06:35 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-07 13:06:35 -0800
commit02006f7a7a715af10974a30b7ad8e6ee340f954c (patch)
treeb2b570b740e0f1e2ac5c754d955802d6584e20c6 /block/blk-merge.c
parent1d8b0e79083d229829a408cd016dc4a038f637dd (diff)
parent3bea6a4c7895fc94965a219a8da9bcf753667901 (diff)
downloadlinux-stable-02006f7a7a715af10974a30b7ad8e6ee340f954c.tar.gz
linux-stable-02006f7a7a715af10974a30b7ad8e6ee340f954c.tar.bz2
linux-stable-02006f7a7a715af10974a30b7ad8e6ee340f954c.zip
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm nouveau fix from Dave Airlie: "Still not back to work, but I decided to forward this fix" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/nouveau/gr/nv40: fix oops in interrupt handler
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions