Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 9 Jun 2005 22:25:29 +0000 (15:25 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 9 Jun 2005 22:25:29 +0000 (15:25 -0700)
commit99fdb2fe523480a8748a5af18139bb1f7785c815
treefbe9d2d5210266544a94ca6b5733c35d8a91d082
parentcf380ee7308db0f067ceb2ae8b852838788bf453
parenta2a64769d0d3cc0380b4b6ecdcb781a2f790a69e
Merge /pub/scm/linux/kernel/git/aegl/linux-2.6