Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 9 Jun 2005 22:25:29 +0000 (15:25 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 9 Jun 2005 22:25:29 +0000 (15:25 -0700)

Trivial merge