]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a487a8f 612eff0)
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
Linux 2.6 source tree