From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Jun 2016 19:11:31 +0000 (-0700)
Subject: Merge branch 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: v4.14-rc1~2962
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de4921ce9b3bc68aa530249df8d85cde8edc0968;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'for-4.7-fixes' of git://git./linux/kernel/git/tj/libata

Pull libata fixes from Tejun Heo:
 "Two trivial fixes - one for a bug in the allocation failure path and
  the other a compiler warning fix"

* 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ata: sata_mv: fix mis-conversion in mv_write_cached_reg()
  ata: fix return value check in ahci_seattle_get_port_info()
---

de4921ce9b3bc68aa530249df8d85cde8edc0968