From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Aug 2014 15:23:15 +0000 (-0600)
Subject: Merge branch 'rng-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio
X-Git-Tag: v4.14-rc1~6990
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90c80969145d006eb6294a3aa501d0e156f5e244;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'rng-queue' of git://git./linux/kernel/git/amit/virtio

Pull virtio-rng update from Amit Shah:
 "Add derating factor for use by hwrng core

  Sending directly to you with the commit log changes Ted Ts'o pointed
  out.  Not sure if Rusty's back after his travel, but this already has
  his s-o-b"

* 'rng-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio:
  virtio: rng: add derating factor for use by hwrng core
---

90c80969145d006eb6294a3aa501d0e156f5e244