| commit | ae94b8075a2ed58d2318ef03827b25bc844f844e | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sat Jul 12 07:29:02 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Sat Jul 12 07:29:02 2008 +0200 |
| tree | 7211f558d841cb40e1015d0b7527643ad55cb8e7 | |
| parent | eca91e7838ec92e8c12122849ec7539c4765b689 [diff] | |
| parent | a26929fb489188ff959b1715ee67f0c9f84405b5 [diff] |
Merge branch 'linus' into x86/core Conflicts: arch/x86/mm/ioremap.c Signed-off-by: Ingo Molnar <mingo@elte.hu>