| commit | a93fc153b1485120ee0abd9bfcae38460e6c00e6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 19 13:16:49 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 19 13:16:49 2015 -0700 |
| tree | b0c3949d47b974ff333e8fe9737bc3c363a4eac1 | |
| parent | 22283c8260d738ddfe8a1ef2af9e9a7b66971149 [diff] | |
| parent | 842159640782539a80153c040d6fc2b80756aa3a [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