Merge tag 'timers-conversion-next' of...

Merge tag 'timers-conversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/core

Pull first batch of scsi conversions that have been Reviewed or Acked from
Kees Cook.