harmonize headers with upcoming 2.6.25

Add stuff from early 2.6.25 merge.

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
3 files changed