| commit | 46e387bbd82d438b9131e237e6e2cb55a825da49 | [log] [tgz] |
|---|---|---|
| author | Andi Kleen <ak@linux.intel.com> | Fri Oct 22 17:40:48 2010 +0200 |
| committer | Andi Kleen <ak@linux.intel.com> | Fri Oct 22 17:40:48 2010 +0200 |
| tree | 414948afd6b4d63c6ea8cc79ce022128bc1bf2eb | |
| parent | e9d08567ef72a2d0fb9b14dded386352d3136442 [diff] | |
| parent | 3ef8fd7f720fc4f462fcdcae2fcde6f1c0536bfe [diff] |
Merge branch 'hwpoison-hugepages' into hwpoison Conflicts: mm/memory-failure.c