Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Dec 2012 04:23:37 +0000 (20:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Dec 2012 04:23:37 +0000 (20:23 -0800)
commit7005cd39707ba59b5b1d3e70da2c448d3235eb3e
tree89ed68e2cfd68f038d58f86a0eb5fe7eea279103
parent2f0bf92513be58d2d65c0a4cc05c5779a7cd81e1
parent6133705494bb02953e1e2cc3018a4373981b3c97
Merge tag 'random_for_linus' of git://git./linux/kernel/git/tytso/random

Pull random updates from Ted Ts'o:
 "A few /dev/random improvements for the v3.8 merge window."

* tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
  random: Mix cputime from each thread that exits to the pool
  random: prime last_data value per fips requirements
  random: fix debug format strings
  random: make it possible to enable debugging without rebuild
kernel/posix-cpu-timers.c