From: Linus Torvalds <torvalds@g5.osdl.org>
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: http://review.tizen.org/git/?a=commitdiff_plain;h=501f74f29498543c27f4f9697f5c1e980dd2de0d;p=platform%2Fkernel%2Flinux-3.10.git

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
---

501f74f29498543c27f4f9697f5c1e980dd2de0d