am e2b177a5: am 83ce99d8: Merge "Define SIOCKILLADDR which isn\'t in the common kernel uapi headers."
* commit 'e2b177a5d1384ebbb82d576637364e5b24450beb': Define SIOCKILLADDR which isn't in the common kernel uapi headers.
This commit is contained in: