| commit | 1d8ce7bc4d05b4a5c04dc17f92fef26989fb5935 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Mar 11 10:29:28 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Mar 11 10:29:28 2009 +0100 |
| tree | 12df0f2e25e95654156b2900bd6df1abb3c2e87a | |
| parent | 3a450de1365d20afde406f0d9b2931a5e4a4fd6a [diff] | |
| parent | 16b71fdf97599f1b1b7f38418ee9922d9f117396 [diff] |
Merge branch 'linus' into core/percpu Conflicts: arch/x86/include/asm/fixmap_64.h