Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Showing
include/net/tc_act/tc_ipt.h
0 → 100644
include/net/x25device.h
0 → 100644
This diff is collapsed.
net/sched/ipt.c
0 → 100644
Please register or sign in to comment