+2011-11-06 Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ * doc/xml/faq.xml: Replace references to C++0x with C++11.
+ * doc/xml/manual/intro.xml: Likewise.
+ * doc/xml/manual/backwards_compatibility.xml: Likewise.
+ * doc/xml/manual/shared_ptr.xml: Likewise.
+ * doc/xml/manual/configure.xml: Likewise.
+ * doc/xml/manual/evolution.xml: Likewise.
+ * doc/xml/manual/using.xml: Likewise.
+ * doc/xml/manual/strings.xml: Likewise.
+ * doc/xml/manual/debug_mode.xml: Likewise.
+ * doc/xml/manual/policy_data_structures.xml: Likewise.
+ * doc/xml/manual/extensions.xml: Likewise.
+ * doc/xml/manual/diagnostics.xml: Likewise.
+ * doc/xml/manual/test.xml: Likewise.
+ * doc/xml/manual/status_cxx200x.xml: Likewise, and rename to...
+ * doc/xml/manual/status_cxx2011.xml: Here.
+ * doc/Makefile.am: Rename status_cxx200x.xml.
+ * doc/Makefile.in: Regenerate.
+ * doc/html/*: Regenerate.
+
+2011-11-06 François Dumont <fdumont@gcc.gnu.org>
+
+ * testsuite/performance/23_containers/insert_erase/41975.cc: Add
+ tests to check performance with or without cache of hash code and with
+ string type that has a costlier hash functor than int type.
+
+2011-11-06 Benjamin Kosnik <bkoz@redhat.com>
+ Andrew MacLeod <amacleod@redhat.com>
+
+ Merged from cxx-mem-model.
+
+ * include/Makefile.am (bits_headers): Remove atomic_0.h, atomic_2.h.
+ * include/Makefile.in: Regenerate.
+ * src/Makefile.am (sources): Rename atomic.cc to
+ compatibility-atomic-c++0x.cc.
+ * src/Makefile.in: Regenerate.
+ * include/bits/atomic_0.h: Remove.
+ * include/bits/atomic_2.h: Incorporate into...
+ * include/bits/atomic_base.h: ...this. Use new __atomic routines.
+ * include/std/atomic: Add generic atomic calls to basic atomic class.
+ * src/atomic.cc: Move...
+ * src/compatibility-atomic-c++0x.cc: ...here.
+ * src/compatibility-c++0x.cc: Tweak.
+ * testsuite/29_atomics/atomic/cons/user_pod.cc: Fix.
+ * testsuite/29_atomics/atomic/requirements/explicit_instantiation/1.cc:
+ Same.
+ * testsuite/29_atomics/headers/atomic/macros.cc: Same.
+