Merged head into linux tree

base/stats/mysql.hh:
    Rename of Statsistics namespace to stats... merge from head

--HG--
extra : convert_revision : a5a7f6268b35e75fba1b1800a74fcd6dbd09d974

diff --cc arch/alpha/alpha_memory.cc
Simple merge

diff --cc arch/alpha/ev5.hh
Simple merge

diff --cc base/stats/mysql.hh
Simple merge

diff --cc base/traceflags.py
Simple merge