From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Nov 2015 18:12:43 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Tag: v4.4-rc1~140
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=1b1050cdc5cdde43177b375b5f22dc070d45d8f8;hp=-c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

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
---

1b1050cdc5cdde43177b375b5f22dc070d45d8f8