commit cb7e5f6f087057570682c961666fb60dae688bc5
author Victor Stinner <victor.stinner@gmail.com> Wed Mar 18 16:05:32 2015 +0100
committer Victor Stinner <victor.stinner@gmail.com> Wed Mar 18 16:05:32 2015 +0100
tree 59bb3691003f16153413cc6a66f7ec85cecb67b8
parent e371b3d21a53fb31c41d4c81143c0ea0fd2cc9e3
parent 444f124fcf5e275ee4dd040e4a75f790c2b4166f

Merge 3.4 (tracemalloc typo)

Modules/_tracemalloc.c

diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c
index 12e32eb..226a473 100644
--- a/Modules/_tracemalloc.c
+++ b/Modules/_tracemalloc.c
@@ -57,7 +57,7 @@
 /* Pack the frame_t structure to reduce the memory footprint on 64-bit
    architectures: 12 bytes instead of 16. This optimization might produce
    SIGBUS on architectures not supporting unaligned memory accesses (64-bit
-   IPS CPU?): on such architecture, the structure must not be packed. */
+   MIPS CPU?): on such architecture, the structure must not be packed. */
 typedef struct
 #ifdef __GNUC__
 __attribute__((packed))