tree a0bfe7f6ed6efa4e0eb7f6b9891a0dc3f2fafe57
parent c101f3136cc98a003d0d16be6fab7d0d950581a6
parent 21517a57e838a1fbb7a54a8a77501024e77f83e0
author Linus Torvalds <torvalds@g5.osdl.org> 1120757091 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1120757091 -0700

Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6