summaryrefslogtreecommitdiffstats
path: root/drivers/ptp
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-11-17 03:14:32 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2019-11-17 03:14:32 +0100
commit1d4c79ed324ad780cfc3ad38364ba1fd585dd2a8 (patch)
tree63dd536eb24e25eb2f2f863df2d532f0fc14fead /drivers/ptp
parentMerge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentRevert "hwrng: core - Freeze khwrng thread during suspend" (diff)
downloadlinux-1d4c79ed324ad780cfc3ad38364ba1fd585dd2a8.tar.xz
linux-1d4c79ed324ad780cfc3ad38364ba1fd585dd2a8.zip
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: "This reverts a number of changes to the khwrng thread which feeds the kernel random number pool from hwrng drivers. They were trying to fix issues with suspend-and-resume but ended up causing regressions" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: Revert "hwrng: core - Freeze khwrng thread during suspend"
Diffstat (limited to 'drivers/ptp')
0 files changed, 0 insertions, 0 deletions