From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 Jul 2009 16:45:31 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: firefly_0821_release~13504
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=59107c6525c0d325649eae807905d34772d5a664;p=firefly-linux-kernel-4.4.55.git

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
---

59107c6525c0d325649eae807905d34772d5a664