Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 16 Jul 2005 00:52:13 +0000 (17:52 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 16 Jul 2005 00:52:13 +0000 (17:52 -0700)

Trivial merge