Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 11 Sep 2005 22:51:40 +0000 (15:51 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 11 Sep 2005 22:51:40 +0000 (15:51 -0700)

Trivial merge