diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-14 14:20:46 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-14 14:20:46 -0800 |
commit | 5ae93760cbedda64eab0a7012cc3785c32399641 (patch) | |
tree | 234554665182ca5f391e081de2a7339b2640ff27 /arch/arm64 | |
parent | e57c641ffb75b90c7f7637916e390dc837b70917 (diff) | |
parent | 0cdbcd6d3ebeffa7d1a475ed7a294315cd046a11 (diff) |
Merge tag 'platform-drivers-x86-v3.18-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
Pull x86 platform drivers fixlets from Darren Hart:
"Just two patches to remove hp_accel events from the keyboard bus
stream via an i8042 filter"
* tag 'platform-drivers-x86-v3.18-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
platform: hp_accel: Add SERIO_I8042 as a dependency since it now includes i8042.h/serio.h
platform: hp_accel: add a i8042 filter to remove HPQ6000 data from kb bus stream
Diffstat (limited to 'arch/arm64')
0 files changed, 0 insertions, 0 deletions