| commit | 10d3285d0b3af641ee446f0be8f0a7f40cb515b6 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sat Jul 26 16:30:19 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Sat Jul 26 16:30:19 2008 +0200 |
| tree | 836ad323a1eae8a4bdd5ab5f5e4271efeb85cf8c | |
| parent | 6dec3a10a7a6093af10cef7ac56021150afd6451 [diff] | |
| parent | 3a61ec387c9092dfc91a5959145d36835a72fc4c [diff] |
Merge branch 'x86/urgent' into x86/core Conflicts: include/asm-x86/gpio.h Signed-off-by: Ingo Molnar <mingo@elte.hu>