diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 06:12:03 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 06:12:03 +0400 |
commit | 23d5385f382a7c7d8b6bf19b0c2cfb3acbb12d31 (patch) | |
tree | b0e2fbbdd8a9b86e0074affd58e35bea9c22e175 /include/linux/tc_act/tc_nat.h | |
parent | b7e97d22113bcaafff93774e3085f5b567eaba9c (diff) | |
parent | 9836d3458cde82626f2828ca6bd44c4a02b56e63 (diff) | |
download | linux-23d5385f382a7c7d8b6bf19b0c2cfb3acbb12d31.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc update from David Miller:
"This is just the UAPI commits for sparc via David Howells."
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
UAPI: (Scripted) Disintegrate arch/sparc/include/asm
Diffstat (limited to 'include/linux/tc_act/tc_nat.h')
0 files changed, 0 insertions, 0 deletions