| commit | 1503af661947b7a4a09355cc2ae6aa0d43f16776 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sat Jul 26 15:30:40 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Sat Jul 26 15:30:40 2008 +0200 |
| tree | 5bfcfadf2dd2d98c2ad251c96d7ee43a6903819a | |
| parent | a31863168660c6b6f6c7ffe05bb6a38e97803326 [diff] | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db [diff] |
Merge branch 'linus' into x86/header-guards Conflicts: include/asm-x86/gpio.h include/asm-x86/ide.h Signed-off-by: Ingo Molnar <mingo@elte.hu>