From: Linus Torvalds Date: Wed, 20 Aug 2014 23:23:06 +0000 (-0500) Subject: Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3951ad2e051543f6cd01706da477a73f19165eb6;p=linux-beck.git Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 Pull x86 platform driver revert from Matthew Garrett: "This clearly shouldn't have been merged. No excuse on my part" * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: Revert "platform/x86/toshiba-apci.c possible bad if test?" --- 3951ad2e051543f6cd01706da477a73f19165eb6