Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 5 Mar 2006 02:51:45 +0000 (18:51 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 5 Mar 2006 02:51:45 +0000 (18:51 -0800)
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  [PATCH] Add missing ifdef for VIA RNG code


Trivial merge