tree bbe0d083829f5858295298f188d885367cf4b1f6
parent 05e882f890038c702a4f15d385135d03cf74ad48
parent 07a2039b8eb0af4ff464efd3dfd95de5c02648c6
author Dmitry Torokhov <dmitry.torokhov@gmail.com> 1244710681 -0700
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> 1244710681 -0700

Merge commit 'v2.6.30' into next