summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-02-18 12:56:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-02-18 12:56:41 -0800
commit0e06fb5b9ac8f0ded3b620e8d78d2587863ef8a1 (patch)
tree630201944a0333430c38bca0292b4ebbe5521b8b /drivers/input
parent9ca2c16f3b4311affcc80c2d0516b2b09709b7d9 (diff)
parent25d76ac888216c369dea91768764728b83769799 (diff)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 Kconfig fixes from Thomas Gleixner: "Three patchlets to correct HIGHMEM64G and CMPXCHG64 dependencies in Kconfig when CPU selections are explicitely set to M586 or M686" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/Kconfig: Explicitly enumerate i686-class CPUs in Kconfig x86/Kconfig: Exclude i586-class CPUs lacking PAE support from the HIGHMEM64G Kconfig group x86/Kconfig: Add missing i586-class CPUs to the X86_CMPXCHG64 Kconfig group
Diffstat (limited to 'drivers/input')
0 files changed, 0 insertions, 0 deletions