Upstream 3.0.40-41

https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/log/?h=linux-3.0.y

Conflicts:
mm: fix wrong argument of migrate_huge_pages() in soft_offline_huge_page()
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-3.0.y&id=cad33da5ceedac56481dd3168e42580e9bec6343

random: add tracepoints for easier debugging and verification
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-3.0.y&id=1edbd889fa5c0343d817ae6fe44ab95870a096b4
(include/trace/events/random.h exist already!)