tree 098f40e08125695a1dca3ca7a2974fc2d4f71fad
parent 746a99a5af60ee676afa2ba469ccd1373493c7e7
parent ab0fd1debe730ec9998678a0c53caefbd121ed10
author Linus Torvalds <torvalds@linux-foundation.org> 1246725931 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1246725931 -0700

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