Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 23:06:15 +0000 (16:06 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 23:06:15 +0000 (16:06 -0700)
commita38133298fc678335a0229e97b6161a7ac6fec84
tree2500f23fd230e67a8eba96b380245ecb43c3fd4c
parent97d26b8042a6f14cc4a19e84e911a953363e3d69
parent70aa488cff83c965c9e1850f48d82b000d0d6c1c
Merge /pub/scm/linux/kernel/git/aegl/linux-2.6