diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-15 12:25:08 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-15 12:25:08 -0500 |
| commit | 0da3e7f526fde7a6522a3038b7ce609fc50f6707 (patch) | |
| tree | c6e2dacd96fe7eac8312f3d7c22e0995dc423879 /crypto/ansi_cprng.c | |
| 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
Diffstat (limited to 'crypto/ansi_cprng.c')
0 files changed, 0 insertions, 0 deletions