aboutsummaryrefslogtreecommitdiffstats
path: root/block/blk-core.c
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-11-10 14:51:27 +0100
committerJens Axboe <jaxboe@fusionio.com>2010-11-10 14:51:27 +0100
commit00e375e7e962f938f6b3c93e4cd097a5e26cc788 (patch)
tree9aacf8566c688273af830fc4e50186810068b028 /block/blk-core.c
parentf85acd81aa623e3dcf268c90e5cd8ecf36830984 (diff)
parent4205df34003eec4371020872cdfa228ffae5bd6a (diff)
downloadmrst-s0i3-test-00e375e7e962f938f6b3c93e4cd097a5e26cc788.tar.gz
mrst-s0i3-test-00e375e7e962f938f6b3c93e4cd097a5e26cc788.tar.xz
mrst-s0i3-test-00e375e7e962f938f6b3c93e4cd097a5e26cc788.zip
Merge branch 'for-2.6.37/drivers' into for-linus
Conflicts: drivers/block/cciss.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block/blk-core.c')
0 files changed, 0 insertions, 0 deletions