]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jun 2016 19:11:31 +0000 (12:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jun 2016 19:11:31 +0000 (12:11 -0700)
commitde4921ce9b3bc68aa530249df8d85cde8edc0968
treefaf4e3ac30a5b3af103a329facffdd5dff3b7c9e
parent595d9e34eedc4b8d0631260ce93bbeb08e5b3bd7
parent76bf3441ad6584ddc3aea1501927f21b21ba3a3a
Merge branch 'for-4.7-fixes' of git://git.kernel.org/pub/scm/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()