diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-01 08:12:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-01 08:12:39 -0700 |
| commit | 0d262424b07582a3aa3afa85af645bd436a94a39 (patch) | |
| tree | 4ec3c7034bb244515904c6866642fdc9a9a4b39a /net/ipv4/xfrm4_output.c | |
| parent | 9f29333dae3488542b1344871e8ecb84084ad80e (diff) | |
| parent | c9f2946fbec88d4baa3a6d47eb3a8e6b08b05cd9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Disable preemption during flush_tlb_pending().
[SPARC64]: Kill __flush_tlb_page() prototype.
Diffstat (limited to 'net/ipv4/xfrm4_output.c')
0 files changed, 0 insertions, 0 deletions