commit | 3951ad2e051543f6cd01706da477a73f19165eb6 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 20 18:23:06 2014 -0500 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 20 18:23:06 2014 -0500 |
tree | 34f7bfc370aa9c4fefb84bc3cc9e7e950406db5b | |
parent | e9de42d8eeffdc23af0144cafa9e3deacc489fb9 [diff] | |
parent | 8039aabb6c9f802bca04cc77ca210060a5b53916 [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?"