aboutsummaryrefslogtreecommitdiff
path: root/kernel/time
diff options
context:
space:
mode:
authorLinus Torvalds2014-04-14 16:04:14 -0700
committerLinus Torvalds2014-04-14 16:04:14 -0700
commitdafe344d2288f0ebc0e3d4c6a5eb15bc82189c53 (patch)
tree3bccc69ab1d228520094fe83bbc969e9a0a8b432 /kernel/time
parente79323bd87808fdfbc68ce6c5371bd224d9672ee (diff)
parenteb4a5346e777784f1b5ae9fd0c29b96344bdc3ae (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull bmc2835 crypto fix from Herbert Xu: "This fixes a potential boot crash on bcm2835 due to the recent change that now causes hardware RNGs to be accessed on registration" * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: hwrng: bcm2835 - fix oops when rng h/w is accessed during registration
Diffstat (limited to 'kernel/time')
0 files changed, 0 insertions, 0 deletions