K 10
svn:author
V 3
cem
K 8
svn:date
V 27
2016-05-11T23:00:12.060567Z
K 7
svn:log
V 113
Revert r299467 to fix the kernel build.

$ svn merge -c -299467 .

Approved by:	build being broken for six hours

END