diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-12 07:37:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-12 07:37:59 -0700 |
| commit | 83d3d3c52468394419474d053df9dfe60d8f21c2 (patch) | |
| tree | 2d69c6c54c591c2732f283baedd374d57eb061fc /net/xfrm/xfrm_user.c | |
| parent | 994bd4f9f5a065ead4a92435fdd928ac7fd33809 (diff) | |
| parent | ab5da288ce6a526a0a730362b8c4e03c3a0b58d5 (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:
[SPARC32]: Fix sparc32 modpost warnings.
[SPARC32]: Fix sparc32 modpost warnings with sunzilog
[SPARC32]: Mark srmmu_nocache_init as __init.
[SPARC32]: pcic.c needs asm/irq_regs.h
Diffstat (limited to 'net/xfrm/xfrm_user.c')
0 files changed, 0 insertions, 0 deletions