Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Sep 2010 16:51:54 +0000 (09:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Sep 2010 16:51:54 +0000 (09:51 -0700)
commit56162badadb91aae93843d8d6558c7d7780e3cb2
tree6ec96e5b1e41672b45cacf9080d5f3f0db97118a
parente7553b19da07fffbefe83119f25738e2cc90c426
parentf281fb5fe54e15a7ab802945e42f8e24fceb56b2
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