tree 5ca059da1db7f15d4b29427644ad9c08270c885c
parent 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3
parent 091bf7624d1c90cec9e578a18529f615213ff847
author Dmitry Torokhov <dmitry.torokhov@gmail.com> 1241832567 -0700
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> 1241832567 -0700

Merge commit 'v2.6.30-rc5' into next