From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Oct 2013 19:31:43 +0000 (-0700)
Subject: Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f715729ee4cb666f51749f6cd86d06fff1e6e17b;p=deliverable%2Flinux.git

Merge tag 'random_for_linus' of git://git./linux/kernel/git/tytso/random

Pull /dev/random changes from Ted Ts'o:
 "These patches are designed to enable improvements to /dev/random for
  non-x86 platforms, in particular MIPS and ARM"

* tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
  random: allow architectures to optionally define random_get_entropy()
  random: run random_int_secret_init() run after all late_initcalls
---

f715729ee4cb666f51749f6cd86d06fff1e6e17b
diff --cc init/main.c
index af310afbef28,586cd3359c02..63d3e8f2970c
--- a/init/main.c
+++ b/init/main.c
@@@ -75,7 -75,7 +75,8 @@@
  #include <linux/blkdev.h>
  #include <linux/elevator.h>
  #include <linux/sched_clock.h>
 +#include <linux/context_tracking.h>
+ #include <linux/random.h>
  
  #include <asm/io.h>
  #include <asm/bugs.h>