diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-27 18:34:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-27 18:34:34 -0700 |
| commit | 7b616c8a2f5c8507b4aed6907336ec5b85803a39 (patch) | |
| tree | d6378d23ae5e59f3b8ad881d11949ca0ff7c6efe /include/net/netfilter/nf_conntrack_l3proto.h | |
| parent | febb02bdfe5e2c6ceaa0a38d8b7afca3d98f415a (diff) | |
| parent | 6e8a4fa651975ff808dba130eae442f4cea1671c (diff) | |
| download | linux-3.10-7b616c8a2f5c8507b4aed6907336ec5b85803a39.tar.gz linux-3.10-7b616c8a2f5c8507b4aed6907336ec5b85803a39.tar.bz2 linux-3.10-7b616c8a2f5c8507b4aed6907336ec5b85803a39.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: We need to use compat_sys_ustat() as well.
sparc64: Fix MM refcount check in smp_flush_tlb_pending().
Diffstat (limited to 'include/net/netfilter/nf_conntrack_l3proto.h')
0 files changed, 0 insertions, 0 deletions