| commit | 0da3e7f526fde7a6522a3038b7ce609fc50f6707 | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@linux.intel.com> | Fri Feb 15 09:25:08 2013 -0800 |
| committer | H. Peter Anvin <hpa@linux.intel.com> | Fri Feb 15 09:25:08 2013 -0800 |
| tree | c6e2dacd96fe7eac8312f3d7c22e0995dc423879 | |
| parent | 95c9608478d639dcffc14ea47b31bff021a99ed1 [diff] | |
| parent | 68d00bbebb5a48b7a9056a8c03476a71ecbc30a6 [diff] |
Merge branch 'x86/mm2' into x86/mm x86/mm2 is testing out fine, but has developed conflicts with x86/mm due to patches in adjacent code. Merge them so we can drop x86/mm2 and have a unified branch. Resolved Conflicts: arch/x86/kernel/setup.c