From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 29 Jul 2006 05:47:44 +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=dc710afe95ee9b263ab593c11d86a684f1606872;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.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:
  [libata] sata_promise: comment out duplicate PCI ID
  [PATCH] libata: improve EH action and EHI flag handling
  [PATCH] libata: fix eh_skip_recovery condition
  [PATCH] libata: fix autopsy ehc->i.action and ehc->i.dev handling
---

dc710afe95ee9b263ab593c11d86a684f1606872