]> err.no Git - linux-2.6/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
authorLinus Torvalds <torvalds@evo.osdl.org>
Tue, 6 Sep 2005 12:16:24 +0000 (05:16 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Tue, 6 Sep 2005 12:16:24 +0000 (05:16 -0700)

Trivial merge