diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-13 05:05:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 05:05:51 -0400 |
| commit | accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6 (patch) | |
| tree | 8fb40782e79472ed882ff2098d4dd295557278ee /include/linux/tc_act/Kbuild | |
| parent | 6852fd9b86d05063c6ef49d2e12e061cc7f6a105 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'linus' into oprofile-v2
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h
Diffstat (limited to 'include/linux/tc_act/Kbuild')
| -rw-r--r-- | include/linux/tc_act/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/tc_act/Kbuild b/include/linux/tc_act/Kbuild index 6dac0d7365cc..76990937f4c9 100644 --- a/include/linux/tc_act/Kbuild +++ b/include/linux/tc_act/Kbuild | |||
| @@ -3,3 +3,4 @@ header-y += tc_ipt.h | |||
| 3 | header-y += tc_mirred.h | 3 | header-y += tc_mirred.h |
| 4 | header-y += tc_pedit.h | 4 | header-y += tc_pedit.h |
| 5 | header-y += tc_nat.h | 5 | header-y += tc_nat.h |
| 6 | header-y += tc_skbedit.h | ||