From: Linus Torvalds Date: Fri, 14 Nov 2014 22:20:46 +0000 (-0800) Subject: Merge tag 'platform-drivers-x86-v3.18-3' of git://git.infradead.org/users/dvhart... X-Git-Tag: firefly_0821_release~176^2~2866 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5ae93760cbedda64eab0a7012cc3785c32399641;p=firefly-linux-kernel-4.4.55.git 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 --- 5ae93760cbedda64eab0a7012cc3785c32399641