From: Linus Torvalds Date: Sun, 5 Mar 2006 02:51:45 +0000 (-0800) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.16-rc6~121 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=501f74f29498543c27f4f9697f5c1e980dd2de0d;p=linux-2.6 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 --- 501f74f29498543c27f4f9697f5c1e980dd2de0d