tree c8823725b10bd4d36e9311ea392dfdecb4db7974
parent 541048a1d31399ccdda27346a37eae4a2ad55186
parent 7c9c3a1e5fc8728e948b8fa3cbcfcfb86db3afda
author Linus Torvalds <torvalds@linux-foundation.org> 1326338020 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326338020 -0800

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/intel config: Fix the APB_TIMER selection
  x86/mrst: Add additional debug prints for pb_keys
  x86/intel config: Revamp configuration to allow for Moorestown and Medfield
  x86/intel/scu/ipc: Match the changes in the x86 configuration
  x86/apb: Fix configuration constraints
  x86: Fix INTEL_MID silly
  x86/Kconfig: Cyclone-timer depends on x86-summit
  x86: Reduce clock calibration time during slave cpu startup
  x86/config: Revamp configuration for MID devices
  x86/sfi: Kill the IRQ as id hack