From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Oct 2008 18:41:51 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: firefly_0821_release~17079
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=49fdf6785fd660e18a1eb4588928f47e9fa29a9a;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:
  libata: fix NCQ devices behind port multipliers
  scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map
---

49fdf6785fd660e18a1eb4588928f47e9fa29a9a