diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:23:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:23:49 -0800 |
| commit | b30b77493039b7b95b4d569a66af425b02651edd (patch) | |
| tree | 6ab1e58c7c847c817c5b00fc4329b4f4c60cc08a /net/ipv6/xfrm6_output.c | |
| parent | c951aa62d59210636cc63a569bcf3331be7f5b15 (diff) | |
| parent | 26456dcfb8d8e43b1b64b2a14710694cf7a72f05 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/vsx: Fix VSX alignment handler for regs 32-63
powerpc/ps3: Move ps3_mm_add_memory to device_initcall
powerpc/mm: Fix numa reserve bootmem page selection
powerpc/mm: Fix _PAGE_CHG_MASK to protect _PAGE_SPECIAL
Diffstat (limited to 'net/ipv6/xfrm6_output.c')
0 files changed, 0 insertions, 0 deletions