• Linus Torvalds's avatar
    Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · dda5f0a3
    Linus Torvalds authored
    * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      MAINTAINERS: Update timer related entries
      timers: Use this_cpu_read
      timerqueue: Make timerqueue_getnext() static inline
      hrtimer: fix timerqueue conversion flub
      hrtimers: Convert hrtimers to use timerlist infrastructure
      timers: Fixup allmodconfig build issue
      timers: Rename timerlist infrastructure to timerqueue
      timers: Introduce timerlist infrastructure.
      hrtimer: Remove stale comment on curr_timer
      timer: Warn when del_timer_sync() is called in hardirq context
      timer: Del_timer_sync() can be used in softirq context
      timer: Make try_to_del_timer_sync() the same on SMP and UP
      posix-timers: Annotate lock_timer()
      timer: Permit statically-declared work with deferrable timers
      time: Use ARRAY_SIZE macro in timecompare.c
      timer: Initialize the field slack of timer_list
      timer_list: Remove alignment padding on 64 bit when CONFIG_TIMER_STATS
      time: Compensate for rounding on odd-frequency clocksources
    
    Fix up trivial conflict in MAINTAINERS
    dda5f0a3
MAINTAINERS 180 KB