diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-18 15:14:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-18 15:14:34 -0700 |
| commit | a86d52667d8eda5de39393ce737794403bdce1eb (patch) | |
| tree | 9f9bc84abe5fdfd6a27905fb35c08949a9bdfe0a /net/unix/af_unix.c | |
| parent | Revert "block: add missing block_bio_complete() tracepoint" (diff) | |
| parent | Revert "hp-wmi: Add support for SMBus hotkeys" (diff) | |
| download | linux-a86d52667d8eda5de39393ce737794403bdce1eb.tar.gz linux-a86d52667d8eda5de39393ce737794403bdce1eb.zip | |
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
Pull x86 platform driver revert from Matthew Garrett:
"It turns out that one of the hp-wmi patches this cycle breaks some
other HP laptops. I think we have a good idea how to work on it for
3.10, but it's safer to just revert it for now."
* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
Revert "hp-wmi: Add support for SMBus hotkeys"
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions