| commit | 501f74f29498543c27f4f9697f5c1e980dd2de0d | |
| author | Linus Torvalds <torvalds@g5.osdl.org> | |
| Sun, 5 Mar 2006 02:51:45 +0000 (4 18:51 -0800) | ||
| committer | Linus Torvalds <torvalds@g5.osdl.org> | |
| Sun, 5 Mar 2006 02:51:45 +0000 (4 18:51 -0800) | ||
| tree | a73666df60eea38aaf0ee8f9a48adef5ae30e3e7 | treesnapshot (tar.gz zip) |
| parent | ea088b8d481fcff001f7e628c44daf39a229d9fc | commitdiff |
| parent | 28e02bac9c943ed85a29b41ccb9bf95641b2e263 | commitdiff |
Merge branch 'upstream-fixes' of /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
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
[PATCH] Add missing ifdef for VIA RNG code