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