summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds2015-03-19 21:16:49 +0100
committerLinus Torvalds2015-03-19 21:16:49 +0100
commita93fc153b1485120ee0abd9bfcae38460e6c00e6 (patch)
treeb0c3949d47b974ff333e8fe9737bc3c363a4eac1 /arch
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff)
parentide_tape: convert jiffies with jiffies_to_msecs (diff)
downloadkernel-qcow2-linux-a93fc153b1485120ee0abd9bfcae38460e6c00e6.tar.gz
kernel-qcow2-linux-a93fc153b1485120ee0abd9bfcae38460e6c00e6.tar.xz
kernel-qcow2-linux-a93fc153b1485120ee0abd9bfcae38460e6c00e6.zip
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
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions