From: Linus Torvalds Date: Sat, 6 Jun 2009 19:17:03 +0000 (-0700) Subject: Merge branch 'upstream-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarz... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9ccb1aa16cef6316831fef61e4aeaa3784035cb8;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'upstream-linus2' of git://git./linux/kernel/git/jgarzik/libata-dev * 'upstream-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata] pata_ali: Use IGN_SIMPLEX --- 9ccb1aa16cef6316831fef61e4aeaa3784035cb8