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