Conrad Meyer f41be0f076 Revert r299467 to fix the kernel build.
$ svn merge -c -299467 .

Approved by:	build being broken for six hours
2016-05-11 23:00:12 +00:00
..
2016-05-09 16:42:46 +00:00
2016-05-06 08:53:24 +00:00
2015-10-15 22:55:08 +00:00