tree b0883a00b1d64ded44837a351f3a9e2c1d5fc06d
parent 9932abb498ca5280027ff57c92a4e948eac41652
author Stephen Hemminger <stephen.hemminger@vyatta.com> 1201848078 -0800
committer Stephen Hemminger <stephen.hemminger@vyatta.com> 1201848078 -0800

harmonize headers with upcoming 2.6.25

Add stuff from early 2.6.25 merge.

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