tree d90095c7a4bf0067a5bc167f02ddb2e11c7880eb
parent e64df3ebe8262c8203d1fe4f541e0241c3112c01
parent 34679ec7a0c45da8161507e1f2e1f72749dfd85c
author Linus Torvalds <torvalds@linux-foundation.org> 1408202595 -0600
committer Linus Torvalds <torvalds@linux-foundation.org> 1408202595 -0600

Merge branch 'rng-queue' of git://git.kernel.org/pub/scm/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