| commit | acd5e38d5c72ef24d28ba860774c8dd7719b5a30 | [log] [tgz] |
|---|---|---|
| author | Tejun Heo <tj@kernel.org> | Tue Dec 11 06:39:41 2012 -0800 |
| committer | Tejun Heo <tj@kernel.org> | Tue Dec 11 06:39:54 2012 -0800 |
| tree | 496b4984cd6e61e0376b60b1cb2ffdb410c5f9f2 | |
| parent | 29594404d7fe73cd80eaa4ee8c43dcc53970c60e [diff] | |
| parent | 15ef4ffaa797034d5ff82844daf8f595d7c6d53c [diff] |
Merge branch 'for-3.8' into for-3.8-test-merge Conflicts: mm/memcontrol.c