Merge tag 'locking-urgent-2020-12-06' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Dec 2020 19:11:32 +0000 (11:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Dec 2020 19:11:32 +0000 (11:11 -0800)
commitff615c98035729776a74f9c86c3b137ae35ac1d3
tree9f176783e0c3a0a12d7b3e9a47a2fa42abdee778
parente6585a493921991653be1fd65c3aa3fb90b000ae
parent4d916140bf28ff027997144ea1bb4299e1536f87
Merge tag 'locking-urgent-2020-12-06' of git://git./linux/kernel/git/tip/tip

Pull intel_idle build fix from Thomas Gleixner:
 "A tiny build fix for a recent change in the intel_idle driver which
  missed a CONFIG dependency and broke the build for certain
  configurations"

* tag 'locking-urgent-2020-12-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  intel_idle: Build fix