| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 20 Dec 2012 04:23:37 +0000 (20:23 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 20 Dec 2012 04:23:37 +0000 (20:23 -0800) |
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
"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
| 1 | 2 | |||
|---|---|---|---|---|
| kernel/posix-cpu-timers.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc kernel/posix-cpu-timers.c
Simple merge