tree 6c2da79366d4695a9c2560ab18259eca8a2a25b4
parent 92c49890922d54cba4b1eadeb0b185773c2c9570
parent 14b395e35d1afdd8019d11b92e28041fad591b71
author Dmitry Torokhov <dmitry.torokhov@gmail.com> 1216616114 -0400
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> 1216616114 -0400

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