From: Linus Torvalds <torvalds@linux-foundation.org>
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-Tag: v3.17-rc2~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3951ad2e051543f6cd01706da477a73f19165eb6;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.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