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)
commit1b1050cdc5cdde43177b375b5f22dc070d45d8f8
treeae822c356725775f61cf9091cd20ddcbb2164d35
parentb0f85fa11aefc4f3e03306b4cd47f113bd57dcba
parent353b39d1b1511376aca71bc3aba62831370561ca
Merge git://git./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