Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...
authorAuke Kok <auke-jan.h.kok@intel.com>
Wed, 21 Jun 2006 20:43:50 +0000 (13:43 -0700)
committerAuke-jan Kok <ahkok@gitlost.site>
Wed, 21 Jun 2006 20:43:50 +0000 (13:43 -0700)

Trivial merge