Merge tag 'for-linus-20180922' of git://git.kernel.dk/linux-block
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 23 Sep 2018 06:33:28 +0000 (08:33 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 23 Sep 2018 06:33:28 +0000 (08:33 +0200)
commita83f87c1d2a93a8fd2413ce8f410b69848db0fd5
tree8e5fae2843a8b788929266b9cfbd0b389763854b
parent328c6333ba3df92d5ea7f2cee46379ed57882af6
parentb57e99b4b8b0ebdf9707424e7ddc0c392bdc5fe6
Merge tag 'for-linus-20180922' of git://git.kernel.dk/linux-block

Jens writes:
  "Just a single fix in this pull request, fixing a regression in
  /proc/diskstats caused by the unification of timestamps."

* tag 'for-linus-20180922' of git://git.kernel.dk/linux-block:
  block: use nanosecond resolution for iostat