Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 24 Jun 2005 00:27:24 +0000 (17:27 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 24 Jun 2005 00:27:24 +0000 (17:27 -0700)
commit16822e62053e73fa7def9decc38a7e287d27d980
treefc736377c5c7e23ee78569392ed31a6030289e44
parenta39451c17f53bbae053555670c7b678d46bcebba
parente608a8072b10258aa18c2e33324def225199ba1d
Merge /pub/scm/linux/kernel/git/aegl/linux-2.6