Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 21 Apr 2005 21:02:34 +0000 (14:02 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 21 Apr 2005 21:02:34 +0000 (14:02 -0700)

Trivial merge