diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:47:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:47:32 -0500 |
| commit | 7032e8696726354d6180d8a2d17191f958cd93ae (patch) | |
| tree | 5af02052e633bcde0e33f77cac52ab4685ad07f1 /arch/x86/mm/ioremap.c | |
| parent | f268fe7333ccd16e3e5b7de0be1df201e40a8e7c (diff) | |
| parent | 3bd323a1da42525317e2ce6c93b97b5ba653bc9d (diff) | |
| parent | b13e24644c138d0ddbc451403c30a96b09bfd556 (diff) | |
Merge branches 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86/uaccess' and 'x86/urgent' into x86/core