diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-05 03:51:45 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-05 03:51:45 +0100 |
commit | 501f74f29498543c27f4f9697f5c1e980dd2de0d (patch) | |
tree | a73666df60eea38aaf0ee8f9a48adef5ae30e3e7 /drivers/parport | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-mmc (diff) | |
parent | [PATCH] Add missing ifdef for VIA RNG code (diff) | |
download | linux-501f74f29498543c27f4f9697f5c1e980dd2de0d.tar.xz linux-501f74f29498543c27f4f9697f5c1e980dd2de0d.zip |
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 'drivers/parport')
0 files changed, 0 insertions, 0 deletions