diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-09-26 12:05:54 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-09-26 12:05:54 -0700 |
| commit | 17deb9c2db01c7813611291d251d8c7dbdfd3c9d (patch) | |
| tree | 6e023c0be7c64de84dd51a671eb09c5c82b56615 /include/uapi/linux/fib_rules.h | |
| parent | f4e6e1ea19737077d958f2bc6c196eb579d97544 (diff) | |
| parent | 389e067032fbb96e439abafae848dd447e4cafb4 (diff) | |
Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64-conversion
Update to tip/timers/core and resolve minor conflict.
Conflicts:
drivers/clocksource/samsung_pwm_timer.c
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include/uapi/linux/fib_rules.h')
| -rw-r--r-- | include/uapi/linux/fib_rules.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/fib_rules.h b/include/uapi/linux/fib_rules.h index 51da65b68b85..2b82d7e30974 100644 --- a/include/uapi/linux/fib_rules.h +++ b/include/uapi/linux/fib_rules.h @@ -44,8 +44,8 @@ enum { FRA_FWMARK, /* mark */ FRA_FLOW, /* flow/class id */ FRA_UNUSED6, - FRA_UNUSED7, - FRA_UNUSED8, + FRA_SUPPRESS_IFGROUP, + FRA_SUPPRESS_PREFIXLEN, FRA_TABLE, /* Extended table id */ FRA_FWMASK, /* mask for netfilter mark */ FRA_OIFNAME, |