]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Nov 2015 18:12:43 +0000 (10:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Nov 2015 18:12:43 +0000 (10:12 -0800)
Pull IDE fixlet from David Miller:
 "Just a y2038 fix to the pdc202xx_new IDE driver"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: pdc202xx_new: Replace timeval with ktime_t


Trivial merge