]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f4c3ab 89eb499)
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Aug 2014 23:23:06 +0000 (18:23 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Aug 2014 23:23:06 +0000 (18:23 -0500)
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?"


Trivial merge
Linux Kernel Source Tree.