tree a73666df60eea38aaf0ee8f9a48adef5ae30e3e7
parent ea088b8d481fcff001f7e628c44daf39a229d9fc
parent 28e02bac9c943ed85a29b41ccb9bf95641b2e263
author Linus Torvalds <torvalds@g5.osdl.org> 1141527105 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1141527105 -0800

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