diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-24 11:05:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-24 11:05:57 +0200 |
| commit | 7f9b4bb76bbe3c2f939c35cdab084873ed60dd7f (patch) | |
| tree | 01604d08bcbc3712a5dd9fc8bb2f4ab5be010536 /kernel | |
| parent | e24eaa1bf2cdb6976e78973ea6c7192a995b25d2 (diff) | |
| parent | 59daa706fbec745684702741b9f5373142dd9fdc (diff) | |
| parent | b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d (diff) | |
Merge branches 'x86/mem' and 'x86/vmware' into auto-latest