]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit624aae907f5b2247172c1cf41549feb2fa3763cb
treea73666df60eea38aaf0ee8f9a48adef5ae30e3e7
parentbb1b80fe7df68c7c208a6c5cb4e809fef1fd1a39
parentdb43a722429ae720e9d2c9802025245255c63b97
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