63ec0aad42b parent 2949ccf9379678df66ecf2ca70ed4656159eacdd parent 0647d8cfd40f7974335884d73deef83feeffc2a0 author Linus Torvalds 1120104183 -0700 committer Linus Torvalds 1120104183 -0700 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 å