net-next MERGE

[David Miller]

Cong, I just did another net --> net-next merge.

Please look at how I resolved the cls_api.c conflict.

Thank you.