Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

Browse source

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  block: prevent merges of discard and write requests

...

This commit is contained in:

Linus Torvalds 2010-09-25 09:51:54 -07:00

parent e7553b19da f281fb5fe5

commit 56162badad

1 changed files with 12 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

block/blk-merge.c

View file