]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 31af92f 70d9237)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Mar 2015 20:16:49 +0000 (13:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Mar 2015 20:16:49 +0000 (13:16 -0700)
commit7cc16e15d6d5d8a36895a32accb5b3617cc0ed26
treeb0c3949d47b974ff333e8fe9737bc3c363a4eac1tree | snapshot
parent31af92f6643c5f2d9ededd590041c144722eda36commit | diff
parent70d9237f77f28b7f01099c689f049268b97f2064commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

Pull IDE fix from David Miller:
 "Just one fix to convert a by-hand conversion of jiffies to msecs, from
  Nicholas McGuire"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide_tape: convert jiffies with jiffies_to_msecs
Linux Kernel Source Tree.