am 02f7a784: am fd07d616: am fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."

* commit '02f7a7847bbad970885ec52d9629fe21689e1a46':
  Don't include <linux/socket.h> directly.