| commit | 59107c6525c0d325649eae807905d34772d5a664 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 4 Jul 2009 16:45:31 +0000 (4 09:45 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 4 Jul 2009 16:45:31 +0000 (4 09:45 -0700) | ||
| tree | 098f40e08125695a1dca3ca7a2974fc2d4f71fad | treesnapshot (tar.gz zip) |
| parent | 746a99a5af60ee676afa2ba469ccd1373493c7e7 | commitdiff |
| parent | ab0fd1debe730ec9998678a0c53caefbd121ed10 | commitdiff |
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
* '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