summaryrefslogtreecommitdiffstats
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-01-07 17:18:45 +1000
committerDave Airlie <airlied@redhat.com>2016-01-07 17:18:45 +1000
commit3bea6a4c7895fc94965a219a8da9bcf753667901 (patch)
tree1938d3793ba2238bfdd817f5985e57a91156b2a1 /block/blk-merge.c
parentb06f3a168cdcd80026276898fd1fee443ef25743 (diff)
parent9daf38f4fcca509d198fa4184760d55cd30a7b31 (diff)
downloadlinux-stable-3bea6a4c7895fc94965a219a8da9bcf753667901.tar.gz
linux-stable-3bea6a4c7895fc94965a219a8da9bcf753667901.tar.bz2
linux-stable-3bea6a4c7895fc94965a219a8da9bcf753667901.zip
Merge branch 'linux-4.4' of git://github.com/skeggsb/linux into drm-fixes
single nv40 oops fix. * 'linux-4.4' of git://github.com/skeggsb/linux: drm/nouveau/gr/nv40: fix oops in interrupt handler
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions