From: Linus Torvalds Date: Sun, 28 Oct 2007 19:03:14 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 X-Git-Tag: firefly_0821_release~24584 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2a397e82c7db18019e408f953dd58dc1963a328c;p=firefly-linux-kernel-4.4.55.git Merge git://git./linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide: add SH-S202J to ivb_list[] drivers/ide/pci/sc1200.c: fix suspend/resume buglets and warnings drivers/ide/pci/generic: fix build for CONFIG_HOTPLUG=n hpt366: fix build for CONFIG_HOTPLUG=n cy82c693: fix build for CONFIG_HOTPLUG=n --- 2a397e82c7db18019e408f953dd58dc1963a328c