projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e9de42d 8039aab)
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)
commit3951ad2e051543f6cd01706da477a73f19165eb6
tree34f7bfc370aa9c4fefb84bc3cc9e7e950406db5btree | snapshot
parente9de42d8eeffdc23af0144cafa9e3deacc489fb9commit | diff
parent8039aabb6c9f802bca04cc77ca210060a5b53916commit | diff
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?"
John Crispins staging tree