kernel/sppp: Clean up #ifdef jungle a bit.
kernel/net*: Remove some #include duplicates.
Merge branch 'master' into gsocdrm_alter