]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74361cb 883d4ca)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 15 Aug 2006 19:31:36 +0000 (12:31 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 15 Aug 2006 19:31:36 +0000 (12:31 -0700)

Trivial merge
Linux 2.6 source tree