| commit | 56162badadb91aae93843d8d6558c7d7780e3cb2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Sep 25 09:51:54 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Sep 25 09:51:54 2010 -0700 |
| tree | 6ec96e5b1e41672b45cacf9080d5f3f0db97118a | |
| parent | e7553b19da07fffbefe83119f25738e2cc90c426 [diff] | |
| parent | f281fb5fe54e15a7ab802945e42f8e24fceb56b2 [diff] |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: prevent merges of discard and write requests