• Linus Torvalds's avatar
    Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c7523a7c
    Linus Torvalds authored
    Pull timer updates from Thomas Gleixner.
    
    Various trivial conflict fixups in arch Kconfig due to addition of
    unrelated entries nearby.  And one slightly more subtle one for sparc32
    (new user of GENERIC_CLOCKEVENTS), fixed up as per Thomas.
    
    * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)
      timekeeping: Fix a few minor newline issues.
      time: remove obsolete declaration
      ntp: Fix a stale comment and a few stray newlines.
      ntp: Correct TAI offset during leap second
      timers: Fixup the Kconfig consolidation fallout
      x86: Use generic time config
      unicore32: Use generic time config
      um: Use generic time config
      tile: Use generic time config
      sparc: Use: generic time config
      sh: Use generic time config
      score: Use generic time config
      s390: Use generic time config
      openrisc: Use generic time config
      powerpc: Use generic time config
      mn10300: Use generic time config
      mips: Use generic time config
      microblaze: Use generic time config
      m68k: Use generic time config
      m32r: Use generic time config
      ...
    c7523a7c
Kconfig 16.2 KB