Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 11 Jul 2005 21:08:08 +0000 (14:08 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 11 Jul 2005 21:08:08 +0000 (14:08 -0700)

Trivial merge