From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 3 Oct 2007 22:44:10 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=804b3f9a16e446cb023417faec58b6506c834052;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  drivers/ata/pata_ixp4xx_cf.c: ioremap return code check
  Ata: pata_marvell, use ioread* for iomap-ped memory
  libata: fix for sata_mv >64KB DMA segments
---

804b3f9a16e446cb023417faec58b6506c834052