Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 24 Jun 2005 00:27:24 +0000 (17:27 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 24 Jun 2005 00:27:24 +0000 (17:27 -0700)

Trivial merge