tree 0c2820b3e04232eaa96f08c1057b87728fb3e7a4
parent 481419ec9fbdf3f4ec5389c7e91a81b4a7ebee8d
parent a9edadbf790d72adf6ebed476cb5caf7743e7e4a
author Dmitry Torokhov <dmitry.torokhov@gmail.com> 1207023746 -0400
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> 1207023746 -0400

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus