am 88ef20ce: Merge "Always #include <sys/...>, not <linux/...>."

* commit '88ef20ce4facae68a3e6b05429bb9f3f73a93996':
  Always #include <sys/...>, not <linux/...>.