Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Jul 2009 16:45:31 +0000 (09:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Jul 2009 16:45:31 +0000 (09:45 -0700)
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  block: don't merge requests of different failfast settings
  cciss: Ignore stale commands after reboot


Trivial merge