summaryrefslogtreecommitdiffstats
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-23 11:55:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-23 11:55:00 -0700
commit35da7a307c535f9c2929cae277f3df425c9f9b1e (patch)
tree2734d54cfa0df8f3b81a4e6179a1eb9489fc1aad /block/blk-merge.c
parent5f05647dd81c11a6a165ccc8f0c1370b16f3bcb0 (diff)
parent7ad58c028652753814054f4e3ac58f925e7343f4 (diff)
downloadlinux-35da7a307c535f9c2929cae277f3df425c9f9b1e.tar.gz
linux-35da7a307c535f9c2929cae277f3df425c9f9b1e.tar.bz2
linux-35da7a307c535f9c2929cae277f3df425c9f9b1e.zip
Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block: block: fix use-after-free bug in blk throttle code
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions