diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-04 18:51:45 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-04 18:51:45 -0800 |
commit | 501f74f29498543c27f4f9697f5c1e980dd2de0d (patch) | |
tree | a73666df60eea38aaf0ee8f9a48adef5ae30e3e7 /fs | |
parent | ea088b8d481fcff001f7e628c44daf39a229d9fc (diff) | |
parent | 28e02bac9c943ed85a29b41ccb9bf95641b2e263 (diff) | |
download | linux-501f74f29498543c27f4f9697f5c1e980dd2de0d.tar.bz2 |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
[PATCH] Add missing ifdef for VIA RNG code
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions