| commit | b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Oct 06 16:15:57 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Oct 06 16:15:57 2008 +0200 |
| tree | a49c776b88db5346eaef6082c271f5d79319654f | |
| parent | fec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0 [diff] | |
| parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 [diff] |
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1 Conflicts: include/asm-x86/dma-mapping.h include/asm-x86/gpio.h include/asm-x86/idle.h include/asm-x86/kvm_host.h include/asm-x86/namei.h include/asm-x86/uaccess.h Signed-off-by: Ingo Molnar <mingo@elte.hu>