summaryrefslogtreecommitdiffstats
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-02 08:59:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-02 08:59:46 -0700
commit6885a7f1ed88607cc9945bb106474ecfecb8e59b (patch)
tree3d377216dc21276909e5d20c30613eb830e45b31 /block/blk-merge.c
parent80fb97479878f2c7c4f300de7758304fc0401006 (diff)
parentaa2064d7dd35ac5812645780d2f22a7899e7c6e1 (diff)
Merge tag 'edac_for_3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into next
Pull EDAC changes from Borislav Petkov: "Just two small fixlets. We have more in the pipe but we didn't get ready in time so more stuff next time" * tag 'edac_for_3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: EDAC: Fix MC scrub mode comparsion bug for correctable errors EDAC, MCE, AMD: Remove leftover unused mask
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions