]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aafb066 73eea4a)
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)
commitd5a71f45bc63dc755b88631f3c0acd39902c6875
treeb0c3949d47b974ff333e8fe9737bc3c363a4eac1tree | snapshot
parentaafb066195abebe0c1b1a5948ee2cdc9895f2b0acommit | diff
parent73eea4a70a1cbe5e2edfa14e4e3f4b0132db175fcommit | 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.