From: Linus Torvalds Date: Thu, 22 Mar 2012 16:04:48 +0000 (-0700) Subject: Merge branch 'akpm' (Andrew's patch-bomb) X-Git-Tag: v3.4-rc1~158 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95211279c5ad00a317c98221d7e4365e02f20836;p=pandora-kernel.git Merge branch 'akpm' (Andrew's patch-bomb) Merge first batch of patches from Andrew Morton: "A few misc things and all the MM queue" * emailed from Andrew Morton : (92 commits) memcg: avoid THP split in task migration thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE memcg: clean up existing move charge code mm/memcontrol.c: remove unnecessary 'break' in mem_cgroup_read() mm/memcontrol.c: remove redundant BUG_ON() in mem_cgroup_usage_unregister_event() mm/memcontrol.c: s/stealed/stolen/ memcg: fix performance of mem_cgroup_begin_update_page_stat() memcg: remove PCG_FILE_MAPPED memcg: use new logic for page stat accounting memcg: remove PCG_MOVE_LOCK flag from page_cgroup memcg: simplify move_account() check memcg: remove EXPORT_SYMBOL(mem_cgroup_update_page_stat) memcg: kill dead prev_priority stubs memcg: remove PCG_CACHE page_cgroup flag memcg: let css_get_next() rely upon rcu_read_lock() cgroup: revert ss_id_lock to spinlock idr: make idr_get_next() good for rcu_read_lock() memcg: remove unnecessary thp check in page stat accounting memcg: remove redundant returns memcg: enum lru_list lru ... --- 95211279c5ad00a317c98221d7e4365e02f20836 Reading git-diff-tree failed