From: Linus Torvalds Date: Sat, 1 Mar 2008 00:54:33 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... X-Git-Tag: firefly_0821_release~22225 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d395991c117d43bfca97101a931a41d062a93852;p=firefly-linux-kernel-4.4.55.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: [libata] wrap kmap_atomic(KM_IRQ0) with local_irq_save/restore() sata_svw: Add support for HT1100 SATA controller --- d395991c117d43bfca97101a931a41d062a93852