Merge of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 2 Jun 2005 02:17:59 +0000 (19:17 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 2 Jun 2005 02:17:59 +0000 (19:17 -0700)

Trivial merge