| commit | 057685cf57066bc8aaed68de1b1970e12f0075d2 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Feb 20 12:15:30 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Feb 20 12:15:30 2009 +0100 |
| tree | e7fea68e7080d6366b45775028bfbdf6237ecda5 | |
| parent | 64b36ca7f408e0bd45487c8c28f168f11f3b6dcd [diff] | |
| parent | fe1200b63d158b28eef6d4de1e5b5f99c681ba2f [diff] |
Merge branch 'for-ingo' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 into tracing/kmemtrace Conflicts: mm/slub.c