projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
22283c8
8421596
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
author
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 19 Mar 2015 20:16:49 +0000
(13:16 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 19 Mar 2015 20:16:49 +0000
(13:16 -0700)
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
Trivial merge