aboutsummaryrefslogtreecommitdiff
path: root/lib/random32.c
diff options
context:
space:
mode:
authorPekka Enberg2010-10-24 19:57:05 +0300
committerPekka Enberg2010-10-24 19:57:05 +0300
commit6d4121f6c20a0e86231d52f535f1c82423b3326f (patch)
tree5c235cac699ca86b504850aa663ddadde0455a61 /lib/random32.c
parent92a5bbc11ff2442a54b2f1d313088c245828ef4e (diff)
parent35da7a307c535f9c2929cae277f3df425c9f9b1e (diff)
Merge branch 'master' into for-linus
Conflicts: include/linux/percpu.h mm/percpu.c
Diffstat (limited to 'lib/random32.c')
0 files changed, 0 insertions, 0 deletions