From: Linus Torvalds Date: Wed, 15 Jul 2009 17:29:09 +0000 (-0700) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=35b5c55fee08e6e4001ba98060a2d0b82f70b5f4;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ahci: add device ID for 82801JI sata controller drivers/ata: Move a dereference below a NULL test libata: implement and use HORKAGE_NOSETXFER, take#2 libata: fix follow-up SRST failure path --- 35b5c55fee08e6e4001ba98060a2d0b82f70b5f4