From: Linus Torvalds Date: Wed, 8 Oct 2008 18:41:10 +0000 (-0700) Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus X-Git-Tag: firefly_0821_release~17850 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=69849375d6b13e94d08cdc94b49b11fbab454a0e;p=firefly-linux-kernel-4.4.55.git Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Sibyte: Register PIO PATA device only for Swarm and Litte Sur --- 69849375d6b13e94d08cdc94b49b11fbab454a0e