summaryrefslogtreecommitdiffstats
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-03-13 05:54:39 +0100
committerIngo Molnar <mingo@elte.hu>2012-03-13 05:54:41 +0100
commite898c6706869fdcbd68b1e7fb0ac7461d98710fe (patch)
tree28054da88ddda324f78f27083b14328113941fbc /block/blk-merge.c
parentc94082656dac74257f63e91f78d5d458ac781fa5 (diff)
parent55283e2537714f9370c4ab847d170acf223daf90 (diff)
Merge branch 'x86/x32' into x86/cleanups
Merge reason: We are going to merge a dependent patch. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions