Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 13 Jul 2005 22:48:33 +0000 (15:48 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 13 Jul 2005 22:48:33 +0000 (15:48 -0700)
commit514fd7fd01d378a7b5584c657d9807fc28f22079
treebda3910b7737a4fac464792657ffedcba185d799
parent1e279dd855d15b72364b4103f872d67d8592647e
parent99ad25a313bda566a346b46a6015afa65bc0a02b
Merge /pub/scm/linux/kernel/git/aegl/linux-2.6